From e3a22019ab3377c9b545e423b02d030ffc6caf3a Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 5 Apr 2024 00:46:19 +0100
Subject: [PATCH] Update Statistics menu to use the same font as the micro
 version of the Timestamp

---
 src/k_hud.cpp    | 21 ++++++++++++++-------
 src/k_hud.h      |  1 +
 src/k_menudraw.c | 23 +++++++++++++----------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index d02285c96..7053e2f25 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -1930,6 +1930,19 @@ tic_t K_TranslateTimer(tic_t drawtime, UINT8 mode, INT32 *return_jitter)
 	return drawtime;
 }
 
+INT32 K_drawKartMicroTime(const char *todrawtext, INT32 workx, INT32 worky, INT32 splitflags)
+{
+	using srb2::Draw;
+	Draw::TextElement text(todrawtext);
+	text.flags(splitflags);
+	text.font(Draw::Font::kZVote);
+
+	INT32 result = text.width();
+	Draw(workx - result, worky).text(text);
+
+	return result;
+}
+
 void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode)
 {
 	// TIME_X = BASEVIDWIDTH-124;	// 196
@@ -2006,13 +2019,7 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, U
 				}
 			}
 
-			using srb2::Draw;
-			Draw::TextElement text(stickermedalinfo.targettext);
-			text.flags(splitflags);
-			text.font(Draw::Font::kZVote);
-
-			workx -= text.width();
-			Draw(workx, worky).text(text);
+			workx -= K_drawKartMicroTime(stickermedalinfo.targettext, workx, worky, splitflags);
 		}
 
 		workx -= (((1 + i - stickermedalinfo.platinumcount)*6) - 1);
diff --git a/src/k_hud.h b/src/k_hud.h
index 24adfa195..1eefc155e 100644
--- a/src/k_hud.h
+++ b/src/k_hud.h
@@ -45,6 +45,7 @@ void K_drawKartFreePlay(void);
 void K_drawKartPowerUps(void);
 void K_drawSpectatorHUD(boolean director);
 void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode);
+INT32 K_drawKartMicroTime(const char *todrawtext, INT32 workx, INT32 worky, INT32 splitflags);
 void K_drawKart2PTimestamp(void);
 void K_drawKart4PTimestamp(void);
 void K_drawEmeraldWin(boolean overlay);
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index c311e86b6..f3c9ead4e 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -8178,20 +8178,23 @@ static void M_DrawStatsMaps(void)
 		{
 			besttime = mapheaderinfo[mnum]->records.timeattack.time;
 
+			const char *todrawtext = "--'--\"--";
+
 			if (besttime)
 			{
-				V_DrawRightAlignedString((BASEVIDWIDTH-24), y+1, 0,
-					va("%02d'%02d\"%02d",
-						G_TicsToMinutes(besttime, true),
-						G_TicsToSeconds(besttime),
-						G_TicsToCentiseconds(besttime)
-					)
+				todrawtext = va("%02d'%02d\"%02d",
+					G_TicsToMinutes(besttime, true),
+					G_TicsToSeconds(besttime),
+					G_TicsToCentiseconds(besttime)
 				);
 			}
-			else
-			{
-				V_DrawRightAlignedString((BASEVIDWIDTH-24), y+1, V_GRAYMAP, "--'--\"--");
-			}
+
+			K_drawKartMicroTime(
+				todrawtext,
+				(BASEVIDWIDTH-24),
+				y,
+				(besttime ? 0 : V_TRANSLUCENT)
+			);
 		}
 
 		M_DrawMapMedals(mnum, medalspos - 8, y, allowtime, allowencore, allowspb);