From 522fccaf2e507ac805d05de46d0d516cfb001c95 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 13 Jun 2018 17:52:23 +0100
Subject: [PATCH] * Record attack tab-HUD tweaks. * Do not subtract a life when
 retrying if you have infinite lives.

---
 src/g_game.c   |  2 +-
 src/hu_stuff.c | 20 ++++++++++++--------
 src/st_stuff.c |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index e5077fb21..2acafddb3 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1893,7 +1893,7 @@ void G_Ticker(boolean run)
 			G_ClearRetryFlag();
 
 			// Costs a life to retry ... unless the player in question is dead already.
-			if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE)
+			if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE && players[consoleplayer].lives != 0x7f)
 				players[consoleplayer].lives -= 1;
 
 			G_DoReborn(consoleplayer);
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index a13801388..bc57931f5 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1029,25 +1029,29 @@ UINT16 hu_demorings;
 
 static void HU_DrawDemoInfo(void)
 {
-	V_DrawString(4, 188-24, V_YELLOWMAP, va(M_GetText("%s's replay"), player_names[0]));
+	INT32 h = 188;
+	if (modeattacking == ATTACKING_NIGHTS)
+		h -= 12;
+
+	V_DrawString(4, h-24, V_YELLOWMAP|V_ALLOWLOWERCASE, va(M_GetText("%s's replay"), player_names[0]));
 	if (modeattacking)
 	{
-		V_DrawString(4, 188-16, V_YELLOWMAP|V_MONOSPACE, "SCORE:");
-		V_DrawRightAlignedString(120, 188-16, V_MONOSPACE, va("%d", hu_demoscore));
+		V_DrawString(4, h-16, V_YELLOWMAP|V_MONOSPACE, "SCORE:");
+		V_DrawRightAlignedString(120, h-16, V_MONOSPACE, va("%d", hu_demoscore));
 
-		V_DrawString(4, 188- 8, V_YELLOWMAP|V_MONOSPACE, "TIME:");
+		V_DrawString(4, h-8, V_YELLOWMAP|V_MONOSPACE, "TIME:");
 		if (hu_demotime != UINT32_MAX)
-			V_DrawRightAlignedString(120, 188- 8, V_MONOSPACE, va("%i:%02i.%02i",
+			V_DrawRightAlignedString(120, h-8, V_MONOSPACE, va("%i:%02i.%02i",
 				G_TicsToMinutes(hu_demotime,true),
 				G_TicsToSeconds(hu_demotime),
 				G_TicsToCentiseconds(hu_demotime)));
 		else
-			V_DrawRightAlignedString(120, 188- 8, V_MONOSPACE, "--:--.--");
+			V_DrawRightAlignedString(120, h-8, V_MONOSPACE, "--:--.--");
 
 		if (modeattacking == ATTACKING_RECORD)
 		{
-			V_DrawString(4, 188   , V_YELLOWMAP|V_MONOSPACE, "RINGS:");
-			V_DrawRightAlignedString(120, 188   , V_MONOSPACE, va("%d", hu_demorings));
+			V_DrawString(4, h, V_YELLOWMAP|V_MONOSPACE, "RINGS:");
+			V_DrawRightAlignedString(120, h, V_MONOSPACE, va("%d", hu_demorings));
 		}
 	}
 }
diff --git a/src/st_stuff.c b/src/st_stuff.c
index d5cc9cf29..2a7e0636a 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -2393,7 +2393,7 @@ static void ST_overlayDrawer(void)
 	)
 		ST_drawTextHUD();
 
-	if (modeattacking)
+	if (modeattacking && !hu_showscores)
 		ST_drawInput();
 
 	ST_drawDebugInfo();