From 6935bf4754807de4c8599a62643849db86978de8 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 1 May 2023 19:06:29 +0100 Subject: [PATCH] S_AttemptToRestoreMusic: Handle both GS_INTERMISSION and musiccountdown (via FALLTHRU) --- src/s_sound.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/s_sound.c b/src/s_sound.c index fb4d156e8..9f04c82e9 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1363,7 +1363,14 @@ static void S_AttemptToRestoreMusic(void) switch (gamestate) { case GS_LEVEL: - P_RestoreMusic(&players[consoleplayer]); + if (musiccountdown != 1) + { + P_RestoreMusic(&players[consoleplayer]); + break; + } + // FALLTHRU + case GS_INTERMISSION: + S_ChangeMusicInternal("racent", true); break; case GS_TITLESCREEN: S_ChangeMusicInternal("_title", looptitle);