From eb78c241406a7f84fc11ee799133a5a8c8a0a589 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 27 Mar 2015 14:37:13 +0100 Subject: [PATCH] - small oversight: TakeSpecialDamage must be called if damage is 0 (to do the special death state checks) but it may not be called if damage is already -1, because that means that damage and pain have already been ruled out completely. --- 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 ed9635269..3b5049ba6 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -1094,7 +1094,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage, } } - if (damage > 0) + if (damage >= 0) { damage = target->TakeSpecialDamage(inflictor, source, damage, mod); }