- moved the combined compatibility flags into FLevelLocals.
This commit is contained in:
parent
d716a17b96
commit
6451b7d592
35 changed files with 162 additions and 97 deletions
|
|
@ -214,7 +214,7 @@ EMoveResult sector_t::MoveFloor(double speed, double dest, int crush, int direct
|
|||
//destheight = (dest < ceilingheight) ? dest : ceilingheight;
|
||||
if (!ceilingplane.isSlope() && !floorplane.isSlope() &&
|
||||
!PortalIsLinked(sector_t::ceiling) &&
|
||||
(!(i_compatflags2 & COMPATF2_FLOORMOVE) && -dest > ceilingplane.fD()))
|
||||
(!(Level->i_compatflags2 & COMPATF2_FLOORMOVE) && -dest > ceilingplane.fD()))
|
||||
{
|
||||
dest = -ceilingplane.fD();
|
||||
}
|
||||
|
|
@ -304,7 +304,7 @@ EMoveResult sector_t::MoveCeiling(double speed, double dest, int crush, int dire
|
|||
//destheight = (dest > floorheight) ? dest : floorheight;
|
||||
if (!ceilingplane.isSlope() && !floorplane.isSlope() &&
|
||||
!PortalIsLinked(sector_t::floor) &&
|
||||
(!(i_compatflags2 & COMPATF2_FLOORMOVE) && dest < -floorplane.fD()))
|
||||
(!(Level->i_compatflags2 & COMPATF2_FLOORMOVE) && dest < -floorplane.fD()))
|
||||
{
|
||||
dest = -floorplane.fD();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue