zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Edward850/zdoom

This commit is contained in:
Christoph Oelckers 2013-12-16 11:56:58 +01:00
parent 74dee4cd63 a993b0288a
commit 9a927c2030
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/p_user.cpp
View File

@ -2473,9 +2473,10 @@ void P_PlayerThink (player_t *player)
if ( player->cheats & CF_HIGHJUMP ) jumpvelz *= 2; if ( player->cheats & CF_HIGHJUMP ) jumpvelz *= 2;
player->mo->velz += jumpvelz; player->mo->velz += jumpvelz;
S_Sound (player->mo, CHAN_BODY, "*jump", 1, ATTN_NORM);
player->mo->flags2 &= ~MF2_ONMOBJ; player->mo->flags2 &= ~MF2_ONMOBJ;
player->jumpTics = -1; 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->flags2 |= MF2_FLY;
player->mo->flags |= MF_NOGRAVITY; player->mo->flags |= MF_NOGRAVITY;
if (player->mo->velz <= -39*FRACUNIT) if ((player->mo->velz <= -39 * FRACUNIT) && !(player->cheats & CF_PREDICTING))
{ // Stop falling scream { // Stop falling scream
S_StopSound (player->mo, CHAN_VOICE); S_StopSound (player->mo, CHAN_VOICE);
} }