From 2036a6204308894a6318d6fb6989e6ba8f387926 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 29 Apr 2022 21:54:22 +0100
Subject: [PATCH] Change when the kstart sound occours, because getting a lag
 spike at a bad time can still make it happen inaccurately early.

---
 src/g_game.c  | 10 ++++++++++
 src/p_setup.c |  9 ---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index f2b0728a7..dd4723c91 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1308,6 +1308,16 @@ void G_StartTitleCard(void)
 	// prepare status bar
 	ST_startTitleCard();
 
+	// play the sound
+	{
+		sfxenum_t kstart = sfx_kstart;
+		if (bossinfo.boss)
+			kstart = sfx_ssa021;
+		else if (encoremode)
+			kstart = sfx_ruby2;
+		S_StartSound(NULL, kstart);
+	}
+
 	// start the title card
 	WipeStageTitle = (!titlemapinaction);
 }
diff --git a/src/p_setup.c b/src/p_setup.c
index 9894523a5..16220128f 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4259,15 +4259,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 		}
 
 		F_RunWipe(wipedefs[wipe_level_toblack], false, ((levelfadecol == 0) ? "FADEMAP1" : "FADEMAP0"), false, false);
-
-		{
-			sfxenum_t kstart = sfx_kstart;
-			if (bossinfo.boss)
-				kstart = sfx_ssa021;
-			else if (encoremode)
-				kstart = sfx_ruby2;
-			S_StartSound(NULL, kstart);
-		}
 	}
 	/*if (!titlemapinaction)
 		wipegamestate = GS_LEVEL;*/