From 8bbbd95dfdbfd1520893cc73217f9ecfda37518b Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Wed, 2 Jan 2019 07:31:40 -0600 Subject: [PATCH] - Fixed: NODAMAGE was not accounted for with pain. --- src/p_interaction.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index 1cac172b32..75b7c95e71 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -797,7 +797,8 @@ static inline bool MustForcePain(AActor *target, AActor *inflictor) static inline bool isFakePain(AActor *target, AActor *inflictor, int damage) { - return ((target->flags7 & MF7_ALLOWPAIN && damage > 0) || (inflictor && (inflictor->flags7 & MF7_CAUSEPAIN))); + return (((target->flags7 & MF7_ALLOWPAIN || target->flags5 & MF5_NODAMAGE) && damage > 0) || + (inflictor && (inflictor->flags7 & MF7_CAUSEPAIN))); } // [MC] Completely ripped out of DamageMobj to make it less messy.