Added client build version to the server information display.

Bootz · Aug 7, 2011 · fce4a65 · fce4a65
1 parent 91777cd
commit fce4a65
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
@@ -167,7 +167,7 @@ extern int main(int argc, char **argv)
     }
     sLog->Initialize();
 
-    sLog->outString("%s (realm-daemon)", _FULLVERSION);
+    sLog->outString("%s (realm-daemon)", _CLIENT_BUILD_REVISION, _FULLVERSION);
 	sLog->outString("   ______  __  __  __  __  ______ __  ______  ______ ");  
     sLog->outString("  /\\  ___\\/\\ \\/ / /\\ \\_\\ \\/\\  ___/\\ \\/\\  == \\/\\  ___\\ ");  
     sLog->outString("  \\ \\___  \\ \\  _'-\\ \\____ \\ \\  __\\ \\ \\ \\  __<\\ \\  __\\ ");  

diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
@@ -98,13 +98,13 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
     std::string uptime = secsToTimeString(sWorld->GetUptime());
     //uint32 updateTime = sWorld->GetUpdateTime();
 
-    PSendSysMessage(_FULLVERSION);
+    PSendSysMessage(_CLIENT_BUILD_REVISION, _FULLVERSION);
     PSendSysMessage(LANG_CONNECTED_PLAYERS, PlayersNum, MaxPlayersNum);
     PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);
     PSendSysMessage(LANG_UPTIME, uptime.c_str());
     //PSendSysMessage("Update time diff: %u.", updateTime); // This is useless
 
-    return true;
+    return true; 
 }
 
 bool ChatHandler::HandleDismountCommand(const char* /*args*/)

diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -991,7 +991,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
             uint32 MaxPlayersNum = sWorld->GetMaxPlayerCount();
             std::string uptime = secsToTimeString(sWorld->GetUptime());
 
-            chH.PSendSysMessage(_FULLVERSION);
+            chH.PSendSysMessage(_CLIENT_BUILD_REVISION, _FULLVERSION);
             chH.PSendSysMessage(LANG_CONNECTED_PLAYERS, PlayersNum, MaxPlayersNum);
             chH.PSendSysMessage(LANG_UPTIME, uptime.c_str());
 

diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -438,7 +438,7 @@ PEXCEPTION_POINTERS pExceptionInfo)
     GetLocalTime(&systime);
 
     // Start out with a banner
-    _tprintf(_T("Revision: %s\r\n"), _FULLVERSION);
+    _tprintf(_T("Revision: %s\r\n"), _CLIENT_BUILD_REVISION, _FULLVERSION);
     _tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute);
     PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;
 

diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h
@@ -28,15 +28,17 @@
 #include "Define.h"
 #include "revision.h"
 
-#define _PACKAGENAME "SkyFireEMU "
-#define _CODENAME "COLD_DAY_IN_HELL"
+#define _PACKAGENAME "SkyFireEMU 4.2.0"
+#define _CODENAME "HELL_FROZE_OVER"
 
 #if TRINITY_ENDIAN == TRINITY_BIGENDIAN
 # define _ENDIAN_STRING "big-endian"
 #else
 # define _ENDIAN_STRING "little-endian"
 #endif
 
+#define _CLIENT_BUILD_REVISION "4.2.0 - 14333"
+
 #if PLATFORM == PLATFORM_WINDOWS
 # ifdef _WIN64
 #  define _FULLVERSION _PACKAGENAME "Hash: " _HASH " (Win64, "_BUILD_DIRECTIVE " (" _ENDIAN_STRING "))"

diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
@@ -127,7 +127,7 @@ int Master::Run()
     BigNumber seed1;
     seed1.SetRand(16 * 8);
 
-    sLog->outString("%s (worldserver-daemon)", _FULLVERSION);
+    sLog->outString("%s (worldserver-daemon)", _CLIENT_BUILD_REVISION, _FULLVERSION);
     sLog->outString("<Ctrl-C> to stop.\n");
 
 	sLog->outString(" ");