diff --git a/src/k_kart.c b/src/k_kart.c index 8c6356fdf..f71ceb049 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5361,7 +5361,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) // Plays the music during and after the starting countdown. if (P_IsLocalPlayer(player)) - S_StartMapMusic(); + S_StartMapMusic(false); } void K_KartPlayerAfterThink(player_t *player) diff --git a/src/p_user.c b/src/p_user.c index 643e03e9b..7612b17e6 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -743,7 +743,7 @@ void P_RestoreMusic(player_t *player) return; if (leveltime < MUSICSTARTTIME) - S_StartMapMusic(); + S_StartMapMusic(true); else // see also where time overs are handled - search for "lives = 2" in this file { INT32 wantedmus = 0; // 0 is level music, 1 is invincibility, 2 is grow diff --git a/src/s_sound.c b/src/s_sound.c index 5e171b6d4..868bccc77 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2276,18 +2276,18 @@ void S_InitMapMusic(void) //S_ChangeMusicEx((encoremode ? "estart" : "kstart"), 0, false, mapmusposition, 0, 0); } -void S_StartMapMusic(void) +void S_StartMapMusic(boolean restore) { //no need to constantly run this after race has started if (leveltime > MUSICSTARTTIME) return; - if (keepmusic) + if (keepmusic && !restore) // make sure this doesent kill the music when its called from P_RestoreMusic in some cases return; if (skipintromus) { - if (leveltime < starttime) // dumb but i dont need this to be spammed honestly + if (leveltime < starttime) S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0); if (leveltime == MUSICSTARTTIME) S_ShowMusicCredit(); diff --git a/src/s_sound.h b/src/s_sound.h index a22763449..887cdd878 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -110,7 +110,7 @@ void S_StopSounds(void); void S_ClearSfx(void); void S_InitMapMusic(void); -void S_StartMapMusic(void); +void S_StartMapMusic(boolean restore); void S_CheckMap(void);