From e3ab58ce4e9f7d05c6d26fb65cc4585c0ea6ac97 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 19 Oct 2014 12:15:30 +0200 Subject: [PATCH 1/3] Build/CMake: CMake options cleanup after febb26d4b711762b1ee605705e7fa949b9871df1 --- cmake/showoptions.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index 9b2c849ec39..ea4820a01f0 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -62,14 +62,6 @@ else() message("* Use coreside debug : No (default)") endif() -if( WIN32 ) - if( USE_MYSQL_SOURCES ) - message("* Use MySQL sourcetree : Yes (default)") - else() - message("* Use MySQL sourcetree : No") - endif() -endif( WIN32 ) - if ( WITHOUT_GIT ) message("* Use GIT revision hash : No") message("") From 2cd4ea9b6bfea9a85c13f039c2ea2f23bf0795b8 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 19 Oct 2014 14:08:03 +0200 Subject: [PATCH 2/3] Core/Misc: Remove dead code Remove a double check on result of same function, with the 2nd being always true. (cherry picked from commit e2c2bce90f1713136c2a256e423e5d136dab2389) --- src/server/game/Entities/Player/Player.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5fa10578328..8a916da9ded 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22531,11 +22531,7 @@ bool Player::IsVisibleGloballyFor(Player const* u) const return GetSession()->GetSecurity() <= u->GetSession()->GetSecurity(); // non faction visibility non-breakable for non-GMs - if (!IsVisible()) - return false; - - // non-gm stealth/invisibility not hide from global player lists - return true; + return false; } template From 183a0c59e0b4ad63158b04dd62d76d20d8bfc24e Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 19 Oct 2014 15:09:15 +0200 Subject: [PATCH 3/3] Core/Misc: Remove unsafe not thread-safe localtime() calls Replace not thread-safe localtime() calls with thread-safe localtime_r(). (cherry picked from commit 5b08387792dae0afbf91ab74808dc978bf418bca) --- src/server/scripts/Commands/cs_guild.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index 7c025cd4e95..e896131fd48 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -278,7 +278,8 @@ public: // Format creation date char createdDateStr[20]; time_t createdDate = guild->GetCreatedDate(); - strftime(createdDateStr, 20, "%Y-%m-%d %H:%M:%S", localtime(&createdDate)); + tm localTm; + strftime(createdDateStr, 20, "%Y-%m-%d %H:%M:%S", localtime_r(&createdDate, &localTm)); handler->PSendSysMessage(LANG_GUILD_INFO_CREATION_DATE, createdDateStr); // Creation Date handler->PSendSysMessage(LANG_GUILD_INFO_MEMBER_COUNT, guild->GetMemberCount()); // Number of Members