From af146071d87c588e140b3aa52995d1268f0cd928 Mon Sep 17 00:00:00 2001 From: Arthur Date: Mon, 2 Jan 2023 07:34:33 -0500 Subject: [PATCH] Check for spindash ability and dashspeed being > 0 before indiscriminately setting roll animation. --- src/p_map.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_map.c b/src/p_map.c index 911d7927c..cb4309f80 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -419,9 +419,11 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) } else { + boolean wasSpindashing = object->player->dashspeed > 0 && (object->player->charability2 == CA2_SPINDASH); + pflags = object->player->pflags & (PF_STARTJUMP | PF_JUMPED | PF_NOJUMPDAMAGE | PF_SPINNING | PF_THOKKED | PF_BOUNCING); // I still need these. - if (pflags & PF_SPINNING) // Ensure we're in the rolling state, and not something like spindash. + if (wasSpindashing) // Ensure we're in the rolling state, and not spindash. P_SetPlayerMobjState(object, S_PLAY_ROLL); } secondjump = object->player->secondjump;