From f145898ca4c60cf9ad7c18c16979b4e6c8bb9648 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Thu, 20 Oct 2016 21:39:58 +0100 Subject: [PATCH] Woops. --- src/p_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index c4b810414..c2115ff7d 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -7013,7 +7013,7 @@ static void P_MovePlayer(player_t *player) && (!(player->pflags & PF_THOKKED) || ((player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP && player->secondjump == UINT8_MAX))) // thokked is optional if you're bubblewrapped { // Force shield activation - if ((player->powers[pw_shield] & SH_NOSTACK) == SH_FORCE) + if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE) { player->pflags |= PF_THOKKED|PF_SHIELDABILITY; #if 1 // almost imperceptible hop for the purposes of aligning with the aura for as long as possible