From 4c0ef9f0a35c6c799c03d09a65e215072d396c3c Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Fri, 21 Oct 2016 11:48:41 +0100 Subject: [PATCH] * No ridiculously-fast float animation. * No falling when you accidentially press spin. --- src/p_user.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index b7e847619..71e6ad021 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -7077,12 +7077,13 @@ static void P_MovePlayer(player_t *player) } } } - else if ((cmd->buttons & BT_JUMP) && (player->pflags & PF_THOKKED)) // Super Sonic move + + if ((cmd->buttons & BT_JUMP) && (player->pflags & PF_THOKKED)) // Super Sonic move { if (player->skin == 0 && player->powers[pw_super] && player->speed > FixedMul(5<mo->scale) && P_MobjFlip(player->mo)*player->mo->momz <= 0) { - if (player->panim == PA_ROLL || player->panim == PA_JUMP || player->mo->state-states == S_PLAY_PAIN || player->panim == PA_WALK) + if (player->panim == PA_JUMP || player->panim == PA_FALL) P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_FLOAT); player->mo->momz = 0;