zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-13 06:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed successful bounces on Actor tops not damaging them

Browse source
This commit is contained in:
Boondorl 2024-11-26 21:23:04 -05:00 committed by Rachael Alexanderson
parent ac2c174161
commit 859bca4476
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/playsim/p_mobj.cpp
View file

@ -4379,15 +4379,14 @@ void AActor::Tick ()
} }
if (Vel.Z != 0 && (BounceFlags & BOUNCE_Actors)) 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 // 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. // to be in line with the case when an actor's side is hit.
if (!res && (flags & MF_MISSILE)) if (!P_BounceActor(this, onmo, true) && (flags & MF_MISSILE))
{
P_DoMissileDamage(this, onmo);
P_ExplodeMissile(this, nullptr, onmo); P_ExplodeMissile(this, nullptr, onmo);
} }
}
else else
{ {
flags2 |= MF2_ONMOBJ; flags2 |= MF2_ONMOBJ;