Skip to content

Commit

Permalink
Fixed successful bounces on Actor tops not damaging them
Browse files Browse the repository at this point in the history
  • Loading branch information
Boondorl authored and madame-rachelle committed Nov 28, 2024
1 parent 882017f commit 0010f22
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/playsim/p_mobj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down

0 comments on commit 0010f22

Please sign in to comment.