From 20b6db30d78b801aa04f273a3df3e32b7c5590a2 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 17 Aug 2018 21:27:02 +0200 Subject: [PATCH] Added missing check for HITOWNER on bouncers with 0 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 c43a739d4..9ca345d9b 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -1539,7 +1539,7 @@ bool PIT_CheckThing(FMultiBlockThingsIterator &it, FMultiBlockThingsIterator::Ch // MBF bouncer might have a non-0 damage value, but they must not deal damage on impact either. if ((tm.thing->BounceFlags & BOUNCE_Actors) && (tm.thing->IsZeroDamage() || !(tm.thing->flags & MF_MISSILE))) { - return (tm.thing->target == thing || !(thing->flags & MF_SOLID)); + return ((tm.thing->target == thing && !(tm.thing->flags8 & MF8_HITOWNER)) || !(thing->flags & MF_SOLID)); } switch (tm.thing->SpecialMissileHit(thing))