From a993b0288a0364eafe79c229af162dfc061cc717 Mon Sep 17 00:00:00 2001 From: Edward Richardson Date: Mon, 16 Dec 2013 23:02:27 +1300 Subject: [PATCH] Stop prediction from playing and stopping sounds Player prediction would play *jump and stop falling sounds, creating odd cases of sound repetition before the gametic caught up. --- src/p_user.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/p_user.cpp b/src/p_user.cpp index 938c7727f..14fa9c12c 100644 --- a/src/p_user.cpp +++ b/src/p_user.cpp @@ -2473,9 +2473,10 @@ void P_PlayerThink (player_t *player) if ( player->cheats & CF_HIGHJUMP ) jumpvelz *= 2; player->mo->velz += jumpvelz; - S_Sound (player->mo, CHAN_BODY, "*jump", 1, ATTN_NORM); player->mo->flags2 &= ~MF2_ONMOBJ; player->jumpTics = -1; + if (!(player->cheats & CF_PREDICTING)) + S_Sound(player->mo, CHAN_BODY, "*jump", 1, ATTN_NORM); } } @@ -2502,7 +2503,7 @@ void P_PlayerThink (player_t *player) { player->mo->flags2 |= MF2_FLY; player->mo->flags |= MF_NOGRAVITY; - if (player->mo->velz <= -39*FRACUNIT) + if ((player->mo->velz <= -39 * FRACUNIT) && !(player->cheats & CF_PREDICTING)) { // Stop falling scream S_StopSound (player->mo, CHAN_VOICE); }