From 859bca44761e3ed8d9232faa422a4d6edaf7b0c5 Mon Sep 17 00:00:00 2001 From: Boondorl Date: Tue, 26 Nov 2024 21:23:04 -0500 Subject: [PATCH] Fixed successful bounces on Actor tops not damaging them --- src/playsim/p_mobj.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/playsim/p_mobj.cpp b/src/playsim/p_mobj.cpp index 2ef17b2a90..c79255cca1 100644 --- a/src/playsim/p_mobj.cpp +++ b/src/playsim/p_mobj.cpp @@ -4379,14 +4379,13 @@ void AActor::Tick () } if (Vel.Z != 0 && (BounceFlags & BOUNCE_Actors)) { - bool res = P_BounceActor(this, onmo, true); + if (flags & MF_MISSILE) + P_DoMissileDamage(this, onmo); + // If the bouncer is a missile and has hit the other actor it needs to be exploded here // to be in line with the case when an actor's side is hit. - if (!res && (flags & MF_MISSILE)) - { - P_DoMissileDamage(this, onmo); + if (!P_BounceActor(this, onmo, true) && (flags & MF_MISSILE)) P_ExplodeMissile(this, nullptr, onmo); - } } else {