Blood: Use version control revision number on HUD

nukeykt · Jul 12, 2023 · ba243ab · ba243ab
1 parent 95e521b
commit ba243ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/source/blood/src/common_game.h b/source/blood/src/common_game.h
@@ -41,7 +41,6 @@ extern int g_useCwd;
 #define BLOODWIDESCREENDEF "blood_widescreen.def"
 
 #define BYTEVERSION 104
-#define EXEVERSION 101
 
 void _SetErrorLoc(const char *pzFile, int nLine);
 void _ThrowError(const char *pzFormat, ...);

diff --git a/source/blood/src/globals.cpp b/source/blood/src/globals.cpp
@@ -103,7 +103,11 @@ const char *GetVersionString(void)
         gVersionString = gVersionStringBuf;
         if (!gVersionString)
             return NULL;
-        sprintf(gVersionString, "%d.%02d", EXEVERSION / 100, EXEVERSION % 100);
+
+        Bstrncpyz(gVersionStringBuf, s_buildRev, sizeof(gVersionStringBuf));
+        char * const pHyphen = strchr(gVersionStringBuf, '-');
+        if (pHyphen != nullptr)
+            pHyphen[0] = '\0';
     }
     return gVersionString;
 }
diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp
@@ -1813,8 +1813,7 @@ void UpdateStatusBar(ClockTicks arg)
             TileHGauge(2208, 44, 190, pPlayer->armor[2], 3200);
             DrawStatNumber("%3d", pPlayer->armor[2]>>4, 2230, 50, 193, 0, 0);
         }
-        sprintf(gTempStr, "v%s", GetVersionString());
-        viewDrawText(3, gTempStr, 20, 191, 32, 0, 1, 0);
+        viewDrawText(3, GetVersionString(), 20, 191, 32, 0, 1, 0);
 
         for (int i = 0; i < 6; i++)
         {