From d8234f408b997f0893bb3b07694860e8f15accbc Mon Sep 17 00:00:00 2001
From: ilag <ilagdoesntcheckthisemail@gmail.com>
Date: Thu, 15 May 2014 11:36:17 -0700
Subject: [PATCH] Ensures the force shield's movecount is correctly set before
 comparing

---
 src/p_user.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/p_user.c b/src/p_user.c
index 630c79b025..462e587249 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1404,6 +1404,7 @@ void P_SpawnShieldOrb(player_t *player)
 	if (player->powers[pw_shield] & SH_FORCE)
 	{
 		//Copy and pasted from P_ShieldLook in p_mobj.c
+		shieldobj->movecount = (shieldobj->target->player->powers[pw_shield] & 0xFF);
 		if (shieldobj->movecount < 1)
 		{
 			if (shieldobj->info->painstate)
-- 
GitLab