zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-24 12:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- restored the original implementation of DONTOVERLAP, because Heretic depends on it being somewhat broken.

Browse source 
A side effect of the incorrect implementation is that Gargoyles hitting other Gargoyles won't call P_DamageMobj.
This commit is contained in:
Christoph Oelckers 2016-12-30 20:00:24 +01:00
parent a000b57204
commit a105a08bd6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_interaction.cpp
View file

@ -1545,7 +1545,7 @@ dopain:
target->SetState (target->SeeState); target->SetState (target->SeeState);
} }
} }
else if ((damage > 0 || fakedPain) && source != target->target && target->OkayToSwitchTarget (source)) else if (source != target->target && target->OkayToSwitchTarget (source))
{ {
// Target actor is not intent on another actor, // Target actor is not intent on another actor,
// so make him chase after source // so make him chase after source

2
src/p_map.cpp
View file

@ -1298,7 +1298,7 @@ bool PIT_CheckThing(FMultiBlockThingsIterator &it, FMultiBlockThingsIterator::Ch
if ((tm.thing->Z() >= topz) || (tm.thing->Top() <= thing->Z())) if ((tm.thing->Z() >= topz) || (tm.thing->Top() <= thing->Z()))
return true; return true;
} }
// If they are not allowed to overlap, the rest of this function still needs to be executed. else return unblocking; // This may not really make sense, but Heretic depends on the broken implementation.
} }
} }