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

- Fixed: P_CheckPosition() should checks all lines contacted by the actor. Stopping once it finds

Browse source 
one blocking line will prevent any further lines with specials from activating their specials.

SVN r3198 (trunk)
This commit is contained in:
Randy Heit 2011-05-08 16:58:53 +00:00
parent 0e07113752
commit 44a3e94003
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/p_map.cpp
View file

@ -1401,15 +1401,20 @@ bool P_CheckPosition (AActor *thing, fixed_t x, fixed_t y, FCheckPosition &tm)
//bool onthing = (thingdropoffz != tmdropoffz); //bool onthing = (thingdropoffz != tmdropoffz);
tm.floorz = tm.dropoffz; tm.floorz = tm.dropoffz;
bool good = true;
while ((ld = it.Next())) while ((ld = it.Next()))
{ {
if (!PIT_CheckLine(ld, box, tm)) good &= PIT_CheckLine(ld, box, tm);
return false;
} }
if (!good)
if (tm.ceilingz - tm.floorz < thing->height) {
return false; return false;
}
if (tm.ceilingz - tm.floorz < thing->height)
{
return false;
}
if (tm.touchmidtex) if (tm.touchmidtex)
{ {
tm.dropoffz = tm.floorz; tm.dropoffz = tm.floorz;