mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-03-06 09:21:27 +00:00
Also fix STJr/SRB2#618 since it is highly related.
This commit is contained in:
parent
af146071d8
commit
28f97dcd0b
1 changed files with 6 additions and 0 deletions
|
@ -425,6 +425,12 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
|
||||||
|
|
||||||
if (wasSpindashing) // Ensure we're in the rolling state, and not spindash.
|
if (wasSpindashing) // Ensure we're in the rolling state, and not spindash.
|
||||||
P_SetPlayerMobjState(object, S_PLAY_ROLL);
|
P_SetPlayerMobjState(object, S_PLAY_ROLL);
|
||||||
|
|
||||||
|
if (object->player->charability == CA_GLIDEANDCLIMB && object->player->skidtime && (pflags & PF_JUMPED))
|
||||||
|
{
|
||||||
|
object->player->skidtime = 0; // No skidding should be happening, either.
|
||||||
|
pflags &= ~PF_JUMPED;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
secondjump = object->player->secondjump;
|
secondjump = object->player->secondjump;
|
||||||
washoming = object->player->homing;
|
washoming = object->player->homing;
|
||||||
|
|
Loading…
Reference in a new issue