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

- Fixed: P_TestMobjZ() needs THRUSPECIES and THRUACTORS checks, too.

Browse source 
SVN r1768 (trunk)
This commit is contained in:
Randy Heit 2009-08-11 01:03:58 +00:00
parent da33f333a1
commit 2a9351fa61
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
August 10, 2009 August 10, 2009
- Fixed: P_TestMobjZ() needs THRUSPECIES and THRUACTORS checks, too.
- Fixed: The UDMF loader did not initialize the sectors' sectornum property. - Fixed: The UDMF loader did not initialize the sectors' sectornum property.
August 10, 2009 (Changes by Graf Zahl) August 10, 2009 (Changes by Graf Zahl)

8
src/p_map.cpp
View file

@ -1385,6 +1385,14 @@ bool P_TestMobjZ (AActor *actor, bool quick, AActor **pOnmobj)
{ {
continue; continue;
} }
if ((actor->flags2 | thing->flags2) & MF2_THRUACTORS)
{
continue;
}
if ((actor->flags6 & MF6_THRUSPECIES) && (thing->GetSpecies() == actor->GetSpecies()))
{
continue;
}
if (!(thing->flags & MF_SOLID)) if (!(thing->flags & MF_SOLID))
{ // Can't hit thing { // Can't hit thing
continue; continue;