Merge branch 'stateofwait' into 'next'

Use state function argument for SF_FASTWAIT code instead of checking mobj->state-states

See merge request STJr/SRB2!2627
This commit is contained in:
Radicalicious 2025-02-18 04:17:55 +00:00
commit 8d76e05f98

View file

@ -324,7 +324,7 @@ static boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
mobj->tics = st->tics; mobj->tics = st->tics;
// Adjust the player's animation speed // Adjust the player's animation speed
if (mobj->state-states == S_PLAY_WAIT && (player->charflags & SF_FASTWAIT)) if (state == S_PLAY_WAIT && (player->charflags & SF_FASTWAIT))
mobj->tics = 5; mobj->tics = 5;
else if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE)) else if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE))
mobj->tics = 2; mobj->tics = 2;