From 3b6be9b419fc3346404de6faff9de4eb858adf09 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Thu, 14 Mar 2019 23:21:52 -0400 Subject: [PATCH] Remove redundant music reset block for MIXNIGHTSCOUNTDOWN --- src/p_user.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 1e6bf00a4..ca14c64d4 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -6378,16 +6378,6 @@ static void P_NiGHTSMovement(player_t *player) { P_DeNightserizePlayer(player); S_StartScreamSound(player->mo, sfx_s3k66); - - if (mapheaderinfo[gamemap-1]->levelflags & LF_MIXNIGHTSCOUNTDOWN) - { - S_StopSoundByNum(sfx_timeup); // Kill the "out of time" music, if it's playing. - S_StopFadingMusic(); - S_SetInternalMusicVolume(100); - } - else - P_RestoreMusic(player); // I have my doubts that this is the right place for this... - return; } else if (P_IsLocalPlayer(player) && player->nightstime == 10*TICRATE)