From 2af1c6fc3011d09e6d37e71a09d882793b835720 Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Wed, 12 Jan 2022 20:57:25 -0500
Subject: [PATCH] Fix sounds playing multiple times during intro if
 interpolation is on

---
 src/f_finale.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/f_finale.c b/src/f_finale.c
index eff9ed3f7..0fc575e8e 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -345,16 +345,6 @@ static void F_IntroDrawScene(void)
 	// DRAW A FULL PIC INSTEAD OF FLAT!
 	if (intro_scenenum == 0)
 	{
-		if (finalecount == 8)
-			S_StartSound(NULL, sfx_vroom);
-		else if (finalecount == 47)
-		{
-			// Need to use M_Random otherwise it always uses the same sound
-			INT32 rskin = M_RandomKey(numskins);
-			UINT8 rtaunt = M_RandomKey(2);
-			sfxenum_t rsound = skins[rskin].soundsid[SKSKBST1+rtaunt];
-			S_StartSound(NULL, rsound);
-		}
 		background = W_CachePatchName("KARTKREW", PU_CACHE);
 		highres = true;
 	}
@@ -453,6 +443,20 @@ void F_IntroTicker(void)
 
 	timetonext--;
 
+	if (intro_scenenum == 0)
+	{
+		if (finalecount == 8)
+			S_StartSound(NULL, sfx_vroom);
+		else if (finalecount == 47)
+		{
+			// Need to use M_Random otherwise it always uses the same sound
+			INT32 rskin = M_RandomKey(numskins);
+			UINT8 rtaunt = M_RandomKey(2);
+			sfxenum_t rsound = skins[rskin].soundsid[SKSKBST1+rtaunt];
+			S_StartSound(NULL, rsound);
+		}
+	}
+
 	F_WriteText();
 
 	// check for skipping