From a8ae2f035ec0d8dd50f06c94c29053d90ca9ee88 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 16 Feb 2023 18:23:10 +0000
Subject: [PATCH] K_drawKartTimestamp: Draw in splitscreen if gametype has
 timelimit.

- 2p: In 1p position (slides from right)
- 3p/4p: In top-middle of screen (slides from top)
- Uses time from the display with the highest time, which covers exiting, no contest, etc
- Exposes V_ flags in the function signature
---
 src/k_hud.c      | 46 ++++++++++++++++++++++++++++++++++------------
 src/k_hud.h      |  2 +-
 src/k_menudraw.c |  4 ++--
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/k_hud.c b/src/k_hud.c
index 5c1bec0a6..668de1d52 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -1466,7 +1466,7 @@ static void K_drawKartItem(void)
 	}
 }
 
-void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, UINT8 mode)
+void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode)
 {
 	// TIME_X = BASEVIDWIDTH-124;	// 196
 	// TIME_Y = 6;					//   6
@@ -1474,11 +1474,8 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, UINT8 mode)
 	tic_t worktime;
 	INT32 jitter = 0;
 
-	INT32 splitflags = 0;
 	if (!mode)
 	{
-		splitflags = V_HUDTRANS|V_SLIDEIN|V_SNAPTOTOP|V_SNAPTORIGHT|V_SPLITSCREEN;
-
 		if (timelimitintics > 0)
 		{
 			if (drawtime >= timelimitintics)
@@ -4971,17 +4968,15 @@ void K_drawKartHUD(void)
 	boolean battlefullscreen = false;
 	boolean freecam = demo.freecam;	//disable some hud elements w/ freecam
 	UINT8 i;
+	UINT8 viewnum = R_GetViewNumber();
 
 	// Define the X and Y for each drawn object
 	// This is handled by console/menu values
 	K_initKartHUD();
 
 	// Draw that fun first person HUD! Drawn ASAP so it looks more "real".
-	for (i = 0; i <= r_splitscreen; i++)
-	{
-		if (stplyr == &players[displayplayers[i]] && !camera[i].chase && !freecam)
-			K_drawKartFirstPerson();
-	}
+	if (!camera[viewnum].chase && !freecam)
+		K_drawKartFirstPerson();
 
 	// Draw full screen stuff that turns off the rest of the HUD
 	if (mapreset && stplyr == &players[displayplayers[0]])
@@ -5032,15 +5027,42 @@ void K_drawKartHUD(void)
 	if (LUA_HudEnabled(hud_item) && !freecam)
 		K_drawKartItem();
 
-	// If not splitscreen, draw...
-	if (!r_splitscreen && !demo.title)
+	if (demo.title)
+		;
+	else if (!r_splitscreen)
 	{
 		// Draw the timestamp
 		if (LUA_HudEnabled(hud_time))
-			K_drawKartTimestamp(stplyr->realtime, TIME_X, TIME_Y, 0);
+			K_drawKartTimestamp(stplyr->realtime,
+				TIME_X,
+				TIME_Y,
+				V_HUDTRANS|V_SLIDEIN|V_SNAPTOTOP|V_SNAPTORIGHT,
+				0);
 
 		islonesome = K_drawKartPositionFaces();
 	}
+	else if (viewnum == r_splitscreen
+		&& (gametyperules & GTR_TIMELIMIT)
+		&& timelimitintics > 0)
+	{
+		tic_t highestrealtime = players[displayplayers[1]].realtime;
+
+		// Uses the highest time across all players (handles paused timer on exiting)
+		for (i = 1; i <= r_splitscreen; i++)
+		{
+			if (players[displayplayers[i]].realtime <= highestrealtime)
+				continue;
+			highestrealtime = players[displayplayers[i]].realtime;
+		}
+
+		// Draw the timestamp (mostly) CENTERED
+		if (LUA_HudEnabled(hud_time))
+			K_drawKartTimestamp(highestrealtime,
+				(r_splitscreen == 1 ? TIME_X : ((BASEVIDWIDTH/2) - 69)),
+				TIME_Y,
+				V_HUDTRANS|V_SLIDEIN|V_SNAPTOTOP|(r_splitscreen == 1 ? V_SNAPTORIGHT : 0),
+				0);
+	}
 
 	if (!stplyr->spectator && !demo.freecam) // Bottom of the screen elements, don't need in spectate mode
 	{
diff --git a/src/k_hud.h b/src/k_hud.h
index 982cc76f5..9b783f710 100644
--- a/src/k_hud.h
+++ b/src/k_hud.h
@@ -40,7 +40,7 @@ const char *K_GetItemPatch(UINT8 item, boolean tiny);
 void K_LoadKartHUDGraphics(void);
 void K_drawKartHUD(void);
 void K_drawKartFreePlay(void);
-void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, UINT8 mode);
+void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode);
 void K_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer, INT32 hilicol);
 void K_DrawMapThumbnail(INT32 x, INT32 y, INT32 width, UINT32 flags, UINT16 map, UINT8 *colormap);
 void K_DrawLikeMapThumbnail(INT32 x, INT32 y, INT32 width, UINT32 flags, patch_t *patch, UINT8 *colormap);
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 0963909b7..e09bc5873 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -2266,7 +2266,7 @@ void M_DrawTimeAttack(void)
 			&& (mapheaderinfo[map]->numlaps != 1))
 		{
 			V_DrawRightAlignedString(rightedge-12, timeheight, highlightflags, "BEST LAP:");
-			K_drawKartTimestamp(laprec, 162+t, timeheight+6, 2);
+			K_drawKartTimestamp(laprec, 162+t, timeheight+6, 0, 2);
 			timeheight += 30;
 		}
 		else
@@ -2275,7 +2275,7 @@ void M_DrawTimeAttack(void)
 		}
 
 		V_DrawRightAlignedString(rightedge-12, timeheight, highlightflags, "BEST TIME:");
-		K_drawKartTimestamp(timerec, 162+t, timeheight+6, 1);
+		K_drawKartTimestamp(timerec, 162+t, timeheight+6, 0, 1);
 	}
 	else
 		opty = 80;