zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-02-22 03:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added Gez's thrupushups fix.

Browse source 
SVN r3378 (trunk)
This commit is contained in:
Randy Heit 2012-02-21 20:50:38 +00:00
parent 170284ad57
commit 2918a87479
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_map.cpp
View file

@ -4763,11 +4763,20 @@ int P_PushUp (AActor *thing, FChangePosition *cpos)
{ {
return 1; return 1;
} }
// [GZ] Skip thing intersect test for THRUACTORS things.
if (thing->flags2 & MF2_THRUACTORS)
return 0;
P_FindAboveIntersectors (thing); P_FindAboveIntersectors (thing);
lastintersect = intersectors.Size (); lastintersect = intersectors.Size ();
for (; firstintersect < lastintersect; firstintersect++) for (; firstintersect < lastintersect; firstintersect++)
{ {
AActor *intersect = intersectors[firstintersect]; AActor *intersect = intersectors[firstintersect];
// [GZ] Skip this iteration for THRUSPECIES things
// Should there be MF2_THRUGHOST / MF3_GHOST checks there too for consistency?
// Or would that risk breaking established behavior? THRUGHOST, like MTHRUSPECIES,
// is normally for projectiles which would have exploded by now anyway...
if (thing->flags6 & MF6_THRUSPECIES && thing->GetSpecies() == intersect->GetSpecies())
continue;
if (!(intersect->flags2 & MF2_PASSMOBJ) || if (!(intersect->flags2 & MF2_PASSMOBJ) ||
(!(intersect->flags3 & MF3_ISMONSTER) && intersect->Mass > mymass) || (!(intersect->flags3 & MF3_ISMONSTER) && intersect->Mass > mymass) ||
(intersect->flags4 & MF4_ACTLIKEBRIDGE) (intersect->flags4 & MF4_ACTLIKEBRIDGE)