From 62a4945ca4e1264c74670ad00d9f67d76a880953 Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Tue, 23 Dec 2014 23:30:00 -0600 Subject: [PATCH] - Fixed: CAUSEPAIN didn't work with A_Explode calls featuring no damage. --- src/p_map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index 496abbf0d9..0b86aa41e6 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -4765,7 +4765,7 @@ void P_RadiusAttack(AActor *bombspot, AActor *bombsource, int bombdamage, int bo points *= thing->GetClass()->Meta.GetMetaFixed(AMETA_RDFactor, FRACUNIT) / (double)FRACUNIT; // points and bombdamage should be the same sign - if ((points * bombdamage) > 0 && P_CheckSight(thing, bombspot, SF_IGNOREVISIBILITY | SF_IGNOREWATERBOUNDARY)) + if (((bombspot->flags7 & MF7_CAUSEPAIN) || (points * bombdamage) > 0) && P_CheckSight(thing, bombspot, SF_IGNOREVISIBILITY | SF_IGNOREWATERBOUNDARY)) { // OK to damage; target is in direct path double velz; double thrust;