zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed an inconsistency with missiles bouncing off actors. 

They exploded when hitting a side but not when hitting top or bottom. Changed so that they always explode now.
This commit is contained in:
Christoph Oelckers 2019-08-09 09:36:50 +02:00
parent a239675fb5
commit 5ca1bb3979
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/playsim/p_mobj.cpp
View File

@ -3968,7 +3968,13 @@ void AActor::Tick ()
} }
if (Vel.Z != 0 && (BounceFlags & BOUNCE_Actors)) if (Vel.Z != 0 && (BounceFlags & BOUNCE_Actors))
{ {
P_BounceActor(this, onmo, true); bool res = P_BounceActor(this, onmo, true);
// 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_ExplodeMissile(this, nullptr, onmo);
}
} }
else else
{ {