stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-30 13:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

More strenous checking of ability for these animations in preparation for something I wanna try...

Browse source
This commit is contained in:
toasterbabe 2016-09-10 21:00:57 +01:00
parent fb377ad44f
commit f844fb3460
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.c
View file

@ -3169,7 +3169,7 @@ static void P_PlayerZMovement(mobj_t *mo)
{ {
if (mo->player->cmomx || mo->player->cmomy) if (mo->player->cmomx || mo->player->cmomy)
{ {
if (mo->player->dashmode >= 3*TICRATE && mo->player->panim != PA_PEEL) if (mo->player->charability == CA_DASHMODE && mo->player->dashmode >= 3*TICRATE && mo->player->panim != PA_PEEL)
P_SetPlayerMobjState(mo, S_PLAY_PEEL); P_SetPlayerMobjState(mo, S_PLAY_PEEL);
else if (mo->player->speed >= FixedMul(mo->player->runspeed, mo->scale) && mo->player->panim != PA_RUN) else if (mo->player->speed >= FixedMul(mo->player->runspeed, mo->scale) && mo->player->panim != PA_RUN)
P_SetPlayerMobjState(mo, S_PLAY_RUN); P_SetPlayerMobjState(mo, S_PLAY_RUN);
@ -3180,7 +3180,7 @@ static void P_PlayerZMovement(mobj_t *mo)
} }
else else
{ {
if (mo->player->dashmode >= 3*TICRATE && mo->player->panim != PA_PEEL) if (mo->player->charability == CA_DASHMODE && mo->player->dashmode >= 3*TICRATE && mo->player->panim != PA_PEEL)
P_SetPlayerMobjState(mo, S_PLAY_PEEL); P_SetPlayerMobjState(mo, S_PLAY_PEEL);
if (mo->player->speed >= FixedMul(mo->player->runspeed, mo->scale) && mo->player->panim != PA_RUN) if (mo->player->speed >= FixedMul(mo->player->runspeed, mo->scale) && mo->player->panim != PA_RUN)
P_SetPlayerMobjState(mo, S_PLAY_RUN); P_SetPlayerMobjState(mo, S_PLAY_RUN);

2
src/p_user.c
View file

@ -6528,7 +6528,7 @@ static void P_MovePlayer(player_t *player)
// If your peelout animation is playing, and you're // If your peelout animation is playing, and you're
// going too slow, switch back to the run. // going too slow, switch back to the run.
if (player->panim == PA_PEEL && player->dashmode < 3*TICRATE) if (player->charability == CA_DASHMODE && player->panim == PA_PEEL && player->dashmode < 3*TICRATE)
P_SetPlayerMobjState(player->mo, S_PLAY_RUN); P_SetPlayerMobjState(player->mo, S_PLAY_RUN);
// If your running animation is playing, and you're // If your running animation is playing, and you're