From e083f78f8e5167cc2710eee3368e745ad51a5d32 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Tue, 11 Aug 2020 13:48:16 +1000 Subject: [PATCH] - stop Duke screaming while falling if player puts the jet pack on. No need to keep screaming if the player has saved themselves. --- source/games/duke/src/player_d.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index 4fbfdaefc..b676966d5 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -1562,6 +1562,11 @@ static void operateJetpack(int snum, ESyncBits sb_snum, int psectlotag, int fz, p->pycount &= 2047; p->pyoff = sintable[p->pycount] >> 7; + if (p->jetpack_on && S_CheckActorSoundPlaying(pi, DUKE_SCREAM)) + { + S_StopSound(DUKE_SCREAM, pi); + } + if (p->jetpack_on < 11) { p->jetpack_on++;