From eb16f9d5a90b5e80e56a7fa05eaf095fff0626dc Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 5 Feb 2023 18:17:39 +0000
Subject: [PATCH] G_TickTimeStickerMedals: Move the failed-record sound
 handling out of K_drawKartTimestamp

---
 src/g_game.c | 16 ++++++++++++++++
 src/g_game.h |  3 ++-
 src/k_hud.c  |  7 +------
 src/p_tick.c |  3 +++
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 90b45a2f1..e483d8c77 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -565,6 +565,22 @@ bademblem:
 	}
 }
 
+void G_TickTimeStickerMedals(void)
+{
+	if (players[consoleplayer].realtime > stickermedalinfo.timetoreach)
+	{
+		if (stickermedalinfo.norecord == false)
+		{
+			S_StartSound(NULL, sfx_s3k72); //sfx_s26d); -- you STOLE fizzy lifting drinks
+			stickermedalinfo.norecord = true;
+		}
+	}
+	else
+	{
+		stickermedalinfo.norecord = false;
+	}
+}
+
 //
 // G_UpdateRecords
 //
diff --git a/src/g_game.h b/src/g_game.h
index 1782a6b30..648aab278 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -205,7 +205,7 @@ void G_EndGame(void); // moved from y_inter.c/h and renamed
 extern struct stickermedalinfo
 {
 	UINT8 visiblecount;
-	boolean canplaysound;
+	boolean norecord;
 	tic_t timetoreach;
 	emblem_t *emblems[MAXMEDALVISIBLECOUNT];
 	emblem_t *regenemblem;
@@ -213,6 +213,7 @@ extern struct stickermedalinfo
 } stickermedalinfo;
 
 void G_UpdateTimeStickerMedals(UINT16 map);
+void G_TickTimeStickerMedals(void);
 void G_UpdateRecords(void);
 
 void G_Ticker(boolean run);
diff --git a/src/k_hud.c b/src/k_hud.c
index d48730b12..3c7272725 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -1562,14 +1562,9 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, UINT8 mode)
 		{
 			if (!mode)
 			{
-				if (stplyr->realtime > stickermedalinfo.timetoreach)
+				if (stickermedalinfo.norecord == true)
 				{
 					splitflags = (splitflags &~ V_HUDTRANS)|V_HUDTRANSHALF;
-					if (stickermedalinfo.canplaysound)
-					{
-						S_StartSound(NULL, sfx_s3k72); //sfx_s26d); -- you STOLE fizzy lifting drinks
-						stickermedalinfo.canplaysound = false;
-					}
 				}
 			}
 
diff --git a/src/p_tick.c b/src/p_tick.c
index b3576424d..d113a15f9 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -766,7 +766,10 @@ void P_Ticker(boolean run)
 		}
 
 		if (modeattacking)
+		{
 			G_GhostTicker();
+			G_TickTimeStickerMedals();
+		}
 
 		if (mapreset > 1
 			&& --mapreset <= 1