From 9d4ef0397c92035f99e86d4c216205717985ae32 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Thu, 20 Sep 2018 18:57:37 -0400 Subject: [PATCH] MP Jingle: Remove P_RestoreMusic from space countdown (no reason to have it) --- src/p_enemy.c | 4 +--- src/p_user.c | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 11e3856c4..ceeb6c97d 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3232,10 +3232,8 @@ void A_WaterShield(mobj_t *actor) player->powers[pw_underwater] = 0; if (player->powers[pw_spacetime] > 1) - { player->powers[pw_spacetime] = 0; - P_RestoreMusic(player); - } + S_StartSound(player->mo, actor->info->seesound); } diff --git a/src/p_user.c b/src/p_user.c index cb14814a2..ea58b7eeb 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2255,10 +2255,7 @@ static void P_CheckUnderwaterAndSpaceTimer(player_t *player) } if (player->powers[pw_spacetime] > 1 && !P_InSpaceSector(player->mo)) - { player->powers[pw_spacetime] = 0; - P_RestoreMusic(player); - } // Underwater audio cues if (P_IsLocalPlayer(player) && !player->bot)