zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 23:32:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-07-04 22:37:12 +02:00
commit 6f57c9c8b1
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/p_map.cpp
View file

@ -5466,6 +5466,8 @@ bool P_AdjustFloorCeil(AActor *thing, FChangePosition *cpos)
} }
bool isgood = P_CheckPosition(thing, thing->Pos(), tm); bool isgood = P_CheckPosition(thing, thing->Pos(), tm);
if (!(thing->flags4 & MF4_ACTLIKEBRIDGE))
{
thing->floorz = tm.floorz; thing->floorz = tm.floorz;
thing->ceilingz = tm.ceilingz; thing->ceilingz = tm.ceilingz;
thing->dropoffz = tm.dropoffz; // killough 11/98: remember dropoffs thing->dropoffz = tm.dropoffz; // killough 11/98: remember dropoffs
@ -5474,6 +5476,15 @@ bool P_AdjustFloorCeil(AActor *thing, FChangePosition *cpos)
thing->floorsector = tm.floorsector; thing->floorsector = tm.floorsector;
thing->ceilingpic = tm.ceilingpic; thing->ceilingpic = tm.ceilingpic;
thing->ceilingsector = tm.ceilingsector; thing->ceilingsector = tm.ceilingsector;
}
else
{
// Bridges only keep the info at their spawn position
// This is necessary to prevent moving sectors from altering the bridge's z-position.
// The bridge should remain at its current z, even if the sector change would cause
// floorz or ceilingz to be changed in a way that would make P_ZMovement adjust the bridge.
P_FindFloorCeiling(thing, FFCF_ONLYSPAWNPOS);
}
// restore the PASSMOBJ flag but leave the other flags alone. // restore the PASSMOBJ flag but leave the other flags alone.
thing->flags2 = (thing->flags2 & ~MF2_PASSMOBJ) | flags2; thing->flags2 = (thing->flags2 & ~MF2_PASSMOBJ) | flags2;