Merge commit '183a0c59e0b4ad63158b04dd62d76d20d8bfc24e' into 4.3.4

This commit is contained in:
Carbenium committed 2015-07-21 17:54:19 +02:00
commit 1350a08ee4
3 files changed
+3 -14

No files matched your search

-8
View File
@@ -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("")
+1 -5
View File
@@ -23086,11 +23086,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<class T>
+2 -1
View File
@@ -280,7 +280,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