From ac7abca6f8ddd614d1363af3341e9b23194372f2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Fri, 27 Mar 2015 11:55:11 +0100
Subject: [PATCH] - completely removed fakePain check in case DoSpecialDamage
 returns -1. This signifies a special case that should bypass anything that
 inflicting pain implies.

---
 src/p_interaction.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index 6e5fc37761..032f5e1622 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -1066,11 +1066,8 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 				}
 			}
 			damage = inflictor->DoSpecialDamage (target, damage, mod);
-
-			if ((damage == -1) && (target->player == NULL)) //This isn't meant for the player.
+			if (damage == -1)
 			{
-				if (fakedPain) //Hold off ending the function before we can deal the pain chances.
-					goto fakepain;
 				return -1;
 			}
 		}