From 53a717673f39842e85c1f49657322e3c0a4899d7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 17 Nov 2009 07:18:19 +0000 Subject: [PATCH] - reverted the change that makes 0-damage projectiles call P_DamageMobj. Both Hexen and Heretic depend on such projectiles not doing it as do many mods that create snow/rain effects plus any terrain splash mod. SVN r1984 (trunk) --- docs/rh-log.txt | 5 +++++ src/p_map.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 6ac5258209..c1c2593d2d 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,8 @@ +November 17, 2009 (Changes by Graf Zahl) +- reverted the change that makes 0-damage projectiles call P_DamageMobj. + Both Hexen and Heretic depend on such projectiles not doing it as do many + mods that create snow/rain effects plus any terrain splash mod. + November 15, 2009 (Changes by Graf Zahl) - fixed: fullscreen images with texture scaling used the unscaled size for positioning. To avoid future problems with them I added a new DTA_Fullscreen diff --git a/src/p_map.cpp b/src/p_map.cpp index 223f628167..4a5f91e500 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -1091,7 +1091,7 @@ bool PIT_CheckThing (AActor *thing, FCheckPosition &tm) } // Do damage damage = tm.thing->GetMissileDamage ((tm.thing->flags4 & MF4_STRIFEDAMAGE) ? 3 : 7, 1); - if (damage >= 0) + if ((damage > 0) || (tm.thing->flags6 & MF6_FORCEPAIN)) { P_DamageMobj (thing, tm.thing, tm.thing->target, damage, tm.thing->DamageType); if (damage > 0)