stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'jumping_fixes' into 'master'

Browse source 
Nojumpspin fix

MI can attest to this being a problem that's now solved.

To test, check out root/!LatestSRB2Files/srb2win_branch_jumpfixes.exe and root/MonsterIestyn/robohood.wad.

See merge request !95
This commit is contained in:
Monster Iestyn 2017-05-16 17:02:20 -04:00
commit 551ed797db
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.c
View file

@ -9137,8 +9137,9 @@ void P_PlayerThink(player_t *player)
if (player->panim != PA_ABILITY) if (player->panim != PA_ABILITY)
P_SetPlayerMobjState(player->mo, S_PLAY_GLIDE); P_SetPlayerMobjState(player->mo, S_PLAY_GLIDE);
} }
else if ((player->pflags & PF_JUMPED && !(player->pflags & PF_NOJUMPDAMAGE)) else if ((player->pflags & PF_JUMPED && !(player->pflags & PF_NOJUMPDAMAGE)
&& ((player->charflags & SF_NOJUMPSPIN && player->panim != PA_ROLL) && (player->mo->state-states != S_PLAY_FLOAT && player->mo->state-states != S_PLAY_FLOAT_RUN))
&& ((((player->charflags & (SF_NOJUMPSPIN|SF_NOJUMPDAMAGE)) == (SF_NOJUMPSPIN|SF_NOJUMPDAMAGE)) && player->panim != PA_ROLL)
|| (!(player->charflags & SF_NOJUMPSPIN) && player->panim != PA_JUMP))) || (!(player->charflags & SF_NOJUMPSPIN) && player->panim != PA_JUMP)))
{ {
if (!(player->charflags & SF_NOJUMPSPIN)) if (!(player->charflags & SF_NOJUMPSPIN))