From 217f19158fed3fd060021301bb725e2644a0c0b4 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Sat, 24 Feb 2024 18:07:57 -0600
Subject: [PATCH] Play and don't reset nonsynced level music in TA

Fixes KartKrew/Kart#1064
---
 src/p_setup.cpp |  2 +-
 src/p_tick.c    | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 3f89a31fd..a147e836c 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -8210,7 +8210,7 @@ void P_LoadLevelMusic(void)
 {
 	const char *music = mapheaderinfo[gamemap-1]->musname[mapmusrng];
 
-	if (gametyperules & GTR_NOPOSITION)
+	if (gametyperules & GTR_NOPOSITION || modeattacking != ATTACKING_NONE)
 	{
 		if (!stricmp(Music_Song("level_nosync"), music))
 		{
diff --git a/src/p_tick.c b/src/p_tick.c
index 864971471..2815f16b7 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -1039,7 +1039,18 @@ void P_Ticker(boolean run)
 				}
 
 				// POSITION!! music
-				P_StartPositionMusic(true); // exact times only
+				if (modeattacking == ATTACKING_NONE)
+				{
+					P_StartPositionMusic(true); // exact times only
+				}
+			}
+		}
+
+		if (modeattacking != ATTACKING_NONE)
+		{
+			if (leveltime == 4 && !Music_Playing("level_nosync"))
+			{
+				Music_Play("level_nosync");
 			}
 		}