From 151dccf32fa61e2ee7f9217c16e95431d1a65891 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sun, 1 Jan 2023 15:39:42 -0800
Subject: [PATCH] Parity between title screen and menu version info

---
 src/f_finale.c   | 71 ++++++++++++++++++++++++++----------------------
 src/f_finale.h   |  2 ++
 src/k_menudraw.c |  7 +----
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/f_finale.c b/src/f_finale.c
index e20deae1f..bbac13838 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1889,6 +1889,43 @@ void F_StartTitleScreen(void)
 	F_CacheTitleScreen();
 }
 
+void F_VersionDrawer(void)
+{
+	// An adapted thing from old menus - most games have version info on the title screen now...
+	INT32 texty = vid.height - 10*vid.dupy;
+
+#define addtext(f, str) {\
+	V_DrawThinString(vid.dupx, texty, V_NOSCALESTART|f, str);\
+	texty -= 10*vid.dupy;\
+}
+	if (customversionstring[0] != '\0')
+	{
+		addtext(V_ALLOWLOWERCASE, customversionstring);
+		addtext(0, "Mod version:");
+	}
+	else
+	{
+// Development -- show revision / branch info
+#if defined(TESTERS)
+		addtext(V_ALLOWLOWERCASE|V_SKYMAP, "Tester client");
+		addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", compdate));
+#elif defined(HOSTTESTERS)
+		addtext(V_ALLOWLOWERCASE|V_REDMAP, "Netgame host for testers");
+		addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", compdate));
+#elif defined(DEVELOP)
+		addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, comprevision);
+		addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, compbranch);
+#else // Regular build
+		addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", VERSIONSTRING));
+#endif
+		if (compuncommitted)
+		{
+			addtext(V_REDMAP|V_STRINGDANCE, "! UNCOMMITTED CHANGES !");
+		}
+	}
+#undef addtext
+}
+
 // (no longer) De-Demo'd Title Screen
 void F_TitleScreenDrawer(void)
 {
@@ -1959,39 +1996,7 @@ void F_TitleScreenDrawer(void)
 
 			V_DrawFixedPatch(0, 0, FRACUNIT, 0, kts_copyright, NULL);
 
-			// An adapted thing from old menus - most games have version info on the title screen now...
-			{
-				INT32 texty = vid.height - 10*vid.dupy;
-#define addtext(f, str) {\
-	V_DrawThinString(vid.dupx, texty, V_NOSCALESTART|f, str);\
-	texty -= 10*vid.dupy;\
-}
-				if (customversionstring[0] != '\0')
-				{
-					addtext(V_ALLOWLOWERCASE, customversionstring);
-					addtext(0, "Mod version:");
-				}
-				else
-				{
-// Development -- show revision / branch info
-#if defined(TESTERS)
-					addtext(V_ALLOWLOWERCASE|V_SKYMAP, "Tester client");
-					addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", compdate));
-#elif defined(HOSTTESTERS)
-					addtext(V_ALLOWLOWERCASE|V_REDMAP, "Netgame host for testers");
-					addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", compdate));
-#elif defined(DEVELOP)
-					addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, comprevision);
-					addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, compbranch);
-#else // Regular build
-					addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", VERSIONSTRING));
-#endif
-					if (compuncommitted)
-						addtext(V_REDMAP|V_STRINGDANCE, "! UNCOMMITTED CHANGES !");
-				}
-#undef addtext
-			}
-
+			F_VersionDrawer();
 			break;
 		}
 
diff --git a/src/f_finale.h b/src/f_finale.h
index a42228625..ca1108214 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -60,6 +60,8 @@ void F_EndingDrawer(void);
 void F_CreditTicker(void);
 void F_CreditDrawer(void);
 
+void F_VersionDrawer(void);
+
 void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer);
 void F_CutsceneDrawer(void);
 void F_EndCutScene(void);
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 9071907bc..7c20a0f04 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -541,12 +541,7 @@ void M_Drawer(void)
 			}
 			else
 			{
-#ifdef DEVELOP // Development -- show revision / branch info
-				V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch);
-				V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
-#else // Regular build
-				V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING));
-#endif
+				F_VersionDrawer();
 			}