0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 17:51:11 +00:00

- Fixed: Don't return false from PIT_CheckThing when a shootable missile hits a nonmonster and

infighting is disabled; let the normal conditions apply. Otherwise, you end up with situations
  where monster-fired projectiles can collide with pickups.

SVN r4198 (trunk)
This commit is contained in:
Randy Heit 2013-03-21 22:58:37 +00:00
parent 0c6c78517b
commit 044616a86f

View file

@ -1075,12 +1075,10 @@ bool PIT_CheckThing (AActor *thing, FCheckPosition &tm)
// friendliness and hate status.
if (tm.thing->target->flags & MF_SHOOTABLE)
{
if (!(thing->flags3 & MF3_ISMONSTER))
{
return false; // Question: Should monsters be allowed to shoot barrels in this mode?
// Question: Should monsters be allowed to shoot barrels in this mode?
// The old code does not.
}
if (thing->flags3 & MF3_ISMONSTER)
{
// Monsters that are clearly hostile can always hurt each other
if (!thing->IsHostile (tm.thing->target))
{
@ -1092,6 +1090,7 @@ bool PIT_CheckThing (AActor *thing, FCheckPosition &tm)
}
}
}
}
else if (infight == 0)
{
// 0: Monsters cannot hurt same species except