Blood: Handle branch names in version string

Avoid showing them in the HUD, and change the color.
nukeykt · Aug 28, 2023 · 211bf56 · 211bf56
1 parent c9db8e5
commit 211bf56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/source/blood/src/globals.cpp b/source/blood/src/globals.cpp
@@ -40,6 +40,7 @@ int gFrameRate;
 int gGamma;
 
 char gVersionString[16];
+int gVersionPal;
 
 Resource gSysRes;
 
@@ -98,7 +99,15 @@ void __dassert(const char * pzExpr, const char * pzFile, int nLine)
 void InitVersionString(void)
 {
     Bstrncpyz(gVersionString, s_buildRev, sizeof(gVersionString));
+
     char * const pHyphen = strchr(gVersionString, '-');
     if (pHyphen != nullptr)
         pHyphen[0] = '\0';
+
+    char * const pBracket = strchr(gVersionString, '[');
+    if (pBracket != nullptr)
+    {
+        pBracket[0] = '\0';
+        gVersionPal = 9;
+    }
 }
diff --git a/source/blood/src/globals.h b/source/blood/src/globals.h
@@ -49,3 +49,4 @@ extern Resource gSysRes;
 
 void InitVersionString(void);
 extern char gVersionString[16];
+extern int gVersionPal;
diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp
@@ -1814,7 +1814,7 @@ void UpdateStatusBar(ClockTicks arg)
             TileHGauge(2208, 44, 190, pPlayer->armor[2], 3200);
             DrawStatNumber("%3d", pPlayer->armor[2]>>4, 2230, 50, 193, 0, 0);
         }
-        viewDrawText(3, gVersionString, 20, 191, 32, 0, 1, 0);
+        viewDrawText(3, gVersionString, 20, 191, 32, gVersionPal, 1, 0);
 
         for (int i = 0; i < 6; i++)
         {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,3 +49,4 @@ extern Resource gSysRes;

		void InitVersionString(void);
		extern char gVersionString[16];
		extern int gVersionPal;