zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 15:02:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/p_map.cpp
View file

@ -1075,19 +1075,18 @@ bool PIT_CheckThing (AActor *thing, FCheckPosition &tm)
// friendliness and hate status. // friendliness and hate status.
if (tm.thing->target->flags & MF_SHOOTABLE) if (tm.thing->target->flags & MF_SHOOTABLE)
{ {
if (!(thing->flags3 & MF3_ISMONSTER)) // Question: Should monsters be allowed to shoot barrels in this mode?
// The old code does not.
if (thing->flags3 & MF3_ISMONSTER)
{ {
return false; // Question: Should monsters be allowed to shoot barrels in this mode? // Monsters that are clearly hostile can always hurt each other
// The old code does not. if (!thing->IsHostile (tm.thing->target))
}
// Monsters that are clearly hostile can always hurt each other
if (!thing->IsHostile (tm.thing->target))
{
// The same if the shooter hates the target
if (thing->tid == 0 || tm.thing->target->TIDtoHate != thing->tid)
{ {
return false; // The same if the shooter hates the target
if (thing->tid == 0 || tm.thing->target->TIDtoHate != thing->tid)
{
return false;
}
} }
} }
} }