zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added missing check for HITOWNER on bouncers with 0 damage.

Browse source
This commit is contained in:
Marisa Kirisame 2018-08-17 21:27:02 +02:00 committed by Christoph Oelckers
parent 155afebb65
commit 20b6db30d7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_map.cpp
View file

@ -1539,7 +1539,7 @@ 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. // 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))) if ((tm.thing->BounceFlags & BOUNCE_Actors) && (tm.thing->IsZeroDamage() || !(tm.thing->flags & MF_MISSILE)))
{ {
return (tm.thing->target == thing || !(thing->flags & MF_SOLID)); return ((tm.thing->target == thing && !(tm.thing->flags8 & MF8_HITOWNER)) || !(thing->flags & MF_SOLID));
} }
switch (tm.thing->SpecialMissileHit(thing)) switch (tm.thing->SpecialMissileHit(thing))