From 581c176da12cd9e68e8e3e24495d6e006c7bfaa2 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Sun, 6 Sep 2015 14:01:47 +0300 Subject: [PATCH] Fix and unify GetCoreVersion Fixed for cmangos (tbc) --- ElunaIncludes.h | 13 ++++--------- GlobalMethods.h | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ElunaIncludes.h b/ElunaIncludes.h index 6784bbd..016f066 100644 --- a/ElunaIncludes.h +++ b/ElunaIncludes.h @@ -52,12 +52,7 @@ #include "AggressorAI.h" #include "BattleGroundMgr.h" #include "SQLStorages.h" -#endif - -#ifdef MANGOS #include "revision.h" -#elif defined(CMANGOS) -#include "revision_nr.h" #endif #if (!defined(TBC) && !defined(CLASSIC)) @@ -73,17 +68,17 @@ typedef Opcodes OpcodesList; #endif /* - * Note: if you add or change a CORE_NAME #define, - * please update LuaGlobalFunctions::GetCoreName docstring. + * Note: if you add or change a CORE_NAME or CORE_VERSION #define, + * please update LuaGlobalFunctions::GetCoreName or LuaGlobalFunctions::GetCoreVersion documentation example string. */ #ifdef MANGOS #define CORE_NAME "MaNGOS" -#define CORE_VERSION REVISION_NR +#define CORE_VERSION REVISION_DATE " " REVISION_TIME #endif #ifdef CMANGOS #define CORE_NAME "cMaNGOS" -#define CORE_VERSION REVISION_NR +#define CORE_VERSION REVISION_DATE " " REVISION_TIME #endif #ifdef TRINITY diff --git a/GlobalMethods.h b/GlobalMethods.h index 519343e..4cff74a 100644 --- a/GlobalMethods.h +++ b/GlobalMethods.h @@ -43,8 +43,8 @@ namespace LuaGlobalFunctions /** * Returns emulator version * - * - For TrinityCore returns the date of the last revision, e.g. `2014-08-13 17:27:22 +0300` - * - For cMaNGOS/MaNGOS returns the revision number, e.g. `12708` + * - For TrinityCore returns the date of the last revision, e.g. `2015-08-26 22:53:12 +0300` + * - For cMaNGOS/MaNGOS returns the date and time of the last revision, e.g. `2015-09-06 13:18:50` * * @return string version */