zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Call SpecialMissileHit directly with zero damaging missiles last to ensure the function is actually triggered.

Browse source
This commit is contained in:
Major Cooke 2020-08-09 14:01:57 -05:00 committed by Christoph Oelckers
parent 5720a54da4
commit 200104777b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/playsim/p_map.cpp
View file

@ -1528,7 +1528,8 @@ bool PIT_CheckThing(FMultiBlockThingsIterator &it, FMultiBlockThingsIterator::Ch
// MBF bouncer might have a non-0 damage value, but they must not deal damage on impact either.
if ((tm.thing->BounceFlags & BOUNCE_Actors) && (tm.thing->IsZeroDamage() || !(tm.thing->flags & MF_MISSILE)))
{
return ((tm.thing->target == thing && !(tm.thing->flags8 & MF8_HITOWNER)) || !(thing->flags & MF_SOLID));
return (((tm.thing->target == thing && !(tm.thing->flags8 & MF8_HITOWNER)) || !(thing->flags & MF_SOLID)) &&
(tm.thing->SpecialMissileHit(thing) != 0));
}
switch (tm.thing->SpecialMissileHit(thing))