Merge branch 'fix-shield-hover' into 'next'

Stop characters from being able to activate their abilities when doing a shield ability!

See merge request STJr/SRB2!522
This commit is contained in:
James R 2019-12-14 16:48:12 -05:00
commit b121bc2b3b

View file

@ -5273,7 +5273,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
player->secondjump = 0;
player->pflags &= ~PF_THOKKED;
}
else if (player->pflags & PF_SLIDING || (gametype == GT_CTF && player->gotflag))
else if (player->pflags & PF_SLIDING || (gametype == GT_CTF && player->gotflag) || player->pflags & PF_SHIELDABILITY)
;
/*else if (P_SuperReady(player))
{