From d45d45583bcda1469ac7af07f68060a9a5cb161a Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Wed, 25 Mar 2015 14:27:12 -0500 Subject: [PATCH] Take PainThresholds into account. --- src/p_interaction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index 7593b55b5..ec3947cc0 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -1474,7 +1474,7 @@ fakepain: //Needed so we can skip the rest of the above, but still obey the orig } } - if ((((damage >= target->PainThreshold) || (fakedPain)) && (pr_damagemobj() < painchance)) + if (((damage >= target->PainThreshold) && (pr_damagemobj() < painchance)) || (inflictor != NULL && (inflictor->flags6 & MF6_FORCEPAIN))) { dopain: