Move build id calculation to xrCore.

digitall · Jan 29, 2016 · 9a02223 · 9a02223
1 parent 2ee0035
commit 9a02223
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 41 deletions.
diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -16,8 +16,6 @@
 #endif // DEBUG
 
 XRCORE_API xrCore Core;
-XRCORE_API u32 build_id;
-XRCORE_API LPCSTR build_date;
 
 namespace CPU
 {
@@ -107,7 +105,8 @@ void xrCore::_initialize(LPCSTR _ApplicationName, LogCallback cb, BOOL init_fs,
 #endif
 #endif
         FS._initialize(flags, 0, fs_fname);
-        Msg("'%s' build %d, %s\n", "xrCore", build_id, build_date);
+        CalculateBuildId();
+        Msg("'%s' build %d, %s\n", "xrCore", buildId, buildDate);
         EFS._initialize();
 #ifdef DEBUG
 #ifndef _EDITOR
@@ -147,6 +146,41 @@ void xrCore::_destroy()
     }
 }
 
+void xrCore::CalculateBuildId()
+{
+    const int startDay = 31;
+    const int startMonth = 1;
+    const int startYear = 1999;
+    const char *monthId[12] =
+    {
+        "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+    };
+    const int daysInMonth[12] =
+    {
+        31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+    };
+    buildDate = __DATE__;
+    int days;
+    int months = 0;
+    int years;
+    string16 month;
+    string256 buffer;
+    xr_strcpy(buffer, buildDate);
+    sscanf(buffer, "%s %d %d", month, &days, &years);
+    for (int i = 0; i<12; i++)
+    {
+        if (_stricmp(monthId[i], month))
+            continue;
+        months = i;
+        break;
+    }
+    buildId = (years- startYear)*365+days-startDay;
+    for (int i = 0; i<months; i++)
+        buildId += daysInMonth[i];
+    for (int i = 0; i<startMonth-1; i++)
+        buildId -= daysInMonth[i];
+}
+
 //. why ???
 #ifdef _EDITOR
 BOOL WINAPI DllEntryPoint(HINSTANCE hinstDLL, DWORD ul_reason_for_call, LPVOID lpvReserved)

diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
@@ -200,6 +200,10 @@ class destructor
 // ********************************************** The Core definition
 class XRCORE_API xrCore
 {
+private:
+    const char *buildDate;
+    u32 buildId;
+
 public:
     string64 ApplicationName;
     string_path ApplicationPath;
@@ -213,6 +217,11 @@ class XRCORE_API xrCore
 public:
     void _initialize(LPCSTR ApplicationName, LogCallback cb = 0, BOOL init_fs = TRUE, LPCSTR fs_fname = 0, bool plugin = false);
     void _destroy();
+    const char *GetBuildDate() const { return buildDate; }
+    u32 GetBuildId() const { return buildId; }
+
+private:
+    void CalculateBuildId();
 };
 
 extern XRCORE_API xrCore Core;

diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -23,8 +23,6 @@
 ENGINE_API bool g_dedicated_server = false;
 ENGINE_API CApplication *pApp = nullptr;
 ENGINE_API CInifile* pGameIni = nullptr;
-XRCORE_API const char *build_date;
-XRCORE_API u32 build_id;
 ENGINE_API bool g_bBenchmark = false;
 string512 g_sBenchmarkName;
 ENGINE_API string512 g_sLaunchOnExit_params;
@@ -36,41 +34,6 @@ namespace
 HWND logoWindow = nullptr;
 
 void RunBenchmark(const char *name);
-
-void CalculateBuildId()
-{
-    const int startDay = 31;
-    const int startMonth = 1;
-    const int startYear = 1999;
-    const char *monthId[12] =
-    {
-        "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-    };
-    const int daysInMonth[12] =
-    {
-        31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-    };
-    build_date = __DATE__;
-    int days;
-    int months = 0;
-    int years;
-    string16 month;
-    string256 buffer;
-    xr_strcpy(buffer, build_date);
-    sscanf(buffer, "%s %d %d", month, &days, &years);
-    for (int i = 0; i<12; i++)
-    {
-        if (_stricmp(monthId[i], month))
-            continue;
-        months = i;
-        break;
-    }
-    build_id = (years- startYear)*365+days-startDay;
-    for (int i = 0; i<months; i++)
-        build_id += daysInMonth[i];
-    for (int i = 0; i<startMonth-1; i++)
-        build_id -= daysInMonth[i];
-}
 }
 
 void InitEngine()
@@ -397,7 +360,6 @@ int RunApplication(const char *commandLine)
         u32 sz = xr_strlen(fsltx);
         sscanf(strstr(commandLine, fsltx)+sz, "%[^ ] ", fsgame);
     }
-    CalculateBuildId();
     Core._initialize("xray", NULL, TRUE, *fsgame ? fsgame : nullptr);
     InitSettings();
     // Adjust player & computer name for Asian