From a694ebc348eea2f8bae33ce42d0827c9ce916530 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Fri, 30 Sep 2016 14:33:15 +0100 Subject: [PATCH] Fixed issue where holding spin when going into a non-horizontal spring would use your whirlwind shield ability immediately. --- src/p_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index 4ff39a181..3659b1e92 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3952,7 +3952,8 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) else if (onground || player->climbing || (player->mo->tracer && player->powers[pw_carry])) {} else if ((player->powers[pw_shield] & SH_NOSTACK) == SH_JUMP - && !(player->pflags & PF_JUMPED)) + && !(player->pflags & PF_JUMPED) + && !(player->pflags & PF_USEDOWN)) P_DoJumpShield(player); else if (!(player->pflags & PF_SLIDING) && ((gametype != GT_CTF) || (!player->gotflag))) {