Skip to content

Commit

Permalink
- fixed an inconsistency with missiles bouncing off actors.
Browse files Browse the repository at this point in the history
They exploded when hitting a side but not when hitting top or bottom. Changed so that they always explode now.
  • Loading branch information
coelckers committed Aug 9, 2019
1 parent a239675 commit 5ca1bb3
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/playsim/p_mobj.cpp
Expand Up @@ -3968,7 +3968,13 @@ void AActor::Tick ()
}
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
{
Expand Down

0 comments on commit 5ca1bb3

Please sign in to comment.