- replaced all direct access to sector plane coefficients with wrapper functions.
This commit is contained in:
Christoph Oelckers
parent
c7ae4688a3
commit
25f5e8449a
30 changed files with 247 additions and 246 deletions
|
|
@ -168,7 +168,7 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
{
|
||||
case 0:
|
||||
// FLOOR
|
||||
lastpos = m_Sector->floorplane.d;
|
||||
lastpos = m_Sector->floorplane.fixD();
|
||||
switch (direction)
|
||||
{
|
||||
case -1:
|
||||
|
|
@ -180,11 +180,11 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
|
||||
if (!MoveAttached(crush, move, 0, true)) return crushed;
|
||||
|
||||
m_Sector->floorplane.d = dest;
|
||||
m_Sector->floorplane.setD(dest);
|
||||
flag = P_ChangeSector (m_Sector, crush, move, 0, false);
|
||||
if (flag)
|
||||
{
|
||||
m_Sector->floorplane.d = lastpos;
|
||||
m_Sector->floorplane.setD(lastpos);
|
||||
P_ChangeSector (m_Sector, crush, -move, 0, true);
|
||||
MoveAttached(crush, -move, 0, false);
|
||||
}
|
||||
|
|
@ -199,12 +199,12 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
{
|
||||
if (!MoveAttached(crush, -speed, 0, true)) return crushed;
|
||||
|
||||
m_Sector->floorplane.d = movedest;
|
||||
m_Sector->floorplane.setD(movedest);
|
||||
|
||||
flag = P_ChangeSector (m_Sector, crush, -speed, 0, false);
|
||||
if (flag)
|
||||
{
|
||||
m_Sector->floorplane.d = lastpos;
|
||||
m_Sector->floorplane.setD(lastpos);
|
||||
P_ChangeSector (m_Sector, crush, speed, 0, true);
|
||||
MoveAttached(crush, speed, 0, false);
|
||||
return crushed;
|
||||
|
|
@ -222,11 +222,10 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
// jff 02/04/98 keep floor from moving thru ceilings
|
||||
// [RH] not so easy with arbitrary planes
|
||||
//destheight = (dest < m_Sector->ceilingheight) ? dest : m_Sector->ceilingheight;
|
||||
if ((m_Sector->ceilingplane.a | m_Sector->ceilingplane.b |
|
||||
m_Sector->floorplane.a | m_Sector->floorplane.b) == 0 &&
|
||||
(!(i_compatflags2 & COMPATF2_FLOORMOVE) && -dest > m_Sector->ceilingplane.d))
|
||||
if (!m_Sector->ceilingplane.isSlope() && !m_Sector->floorplane.isSlope() &&
|
||||
(!(i_compatflags2 & COMPATF2_FLOORMOVE) && -dest > m_Sector->ceilingplane.fixD()))
|
||||
{
|
||||
dest = -m_Sector->ceilingplane.d;
|
||||
dest = -m_Sector->ceilingplane.fixD();
|
||||
}
|
||||
|
||||
movedest = m_Sector->floorplane.GetChangedHeight (speed);
|
||||
|
|
@ -237,12 +236,12 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
|
||||
if (!MoveAttached(crush, move, 0, true)) return crushed;
|
||||
|
||||
m_Sector->floorplane.d = dest;
|
||||
m_Sector->floorplane.setD(dest);
|
||||
|
||||
flag = P_ChangeSector (m_Sector, crush, move, 0, false);
|
||||
if (flag)
|
||||
{
|
||||
m_Sector->floorplane.d = lastpos;
|
||||
m_Sector->floorplane.setD(lastpos);
|
||||
P_ChangeSector (m_Sector, crush, -move, 0, true);
|
||||
MoveAttached(crush, -move, 0, false);
|
||||
}
|
||||
|
|
@ -257,7 +256,7 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
{
|
||||
if (!MoveAttached(crush, speed, 0, true)) return crushed;
|
||||
|
||||
m_Sector->floorplane.d = movedest;
|
||||
m_Sector->floorplane.setD(movedest);
|
||||
|
||||
// COULD GET CRUSHED
|
||||
flag = P_ChangeSector (m_Sector, crush, speed, 0, false);
|
||||
|
|
@ -269,7 +268,7 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
m_Sector->AdjustFloorClip ();
|
||||
return crushed;
|
||||
}
|
||||
m_Sector->floorplane.d = lastpos;
|
||||
m_Sector->floorplane.setD(lastpos);
|
||||
P_ChangeSector (m_Sector, crush, -speed, 0, true);
|
||||
MoveAttached(crush, -speed, 0, false);
|
||||
return crushed;
|
||||
|
|
@ -283,7 +282,7 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
|
||||
case 1:
|
||||
// CEILING
|
||||
lastpos = m_Sector->ceilingplane.d;
|
||||
lastpos = m_Sector->ceilingplane.fixD();
|
||||
switch (direction)
|
||||
{
|
||||
case -1:
|
||||
|
|
@ -291,11 +290,10 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
// jff 02/04/98 keep ceiling from moving thru floors
|
||||
// [RH] not so easy with arbitrary planes
|
||||
//destheight = (dest > m_Sector->floorheight) ? dest : m_Sector->floorheight;
|
||||
if ((m_Sector->ceilingplane.a | m_Sector->ceilingplane.b |
|
||||
m_Sector->floorplane.a | m_Sector->floorplane.b) == 0 &&
|
||||
(!(i_compatflags2 & COMPATF2_FLOORMOVE) && dest < -m_Sector->floorplane.d))
|
||||
if (!m_Sector->ceilingplane.isSlope() && !m_Sector->floorplane.isSlope() &&
|
||||
(!(i_compatflags2 & COMPATF2_FLOORMOVE) && dest < -m_Sector->floorplane.fixD()))
|
||||
{
|
||||
dest = -m_Sector->floorplane.d;
|
||||
dest = -m_Sector->floorplane.fixD();
|
||||
}
|
||||
movedest = m_Sector->ceilingplane.GetChangedHeight (-speed);
|
||||
if (movedest <= dest)
|
||||
|
|
@ -304,12 +302,12 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
|
||||
if (!MoveAttached(crush, move, 1, true)) return crushed;
|
||||
|
||||
m_Sector->ceilingplane.d = dest;
|
||||
m_Sector->ceilingplane.setD(dest);
|
||||
flag = P_ChangeSector (m_Sector, crush, move, 1, false);
|
||||
|
||||
if (flag)
|
||||
{
|
||||
m_Sector->ceilingplane.d = lastpos;
|
||||
m_Sector->ceilingplane.setD(lastpos);
|
||||
P_ChangeSector (m_Sector, crush, -move, 1, true);
|
||||
MoveAttached(crush, -move, 1, false);
|
||||
}
|
||||
|
|
@ -323,7 +321,7 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
{
|
||||
if (!MoveAttached(crush, -speed, 1, true)) return crushed;
|
||||
|
||||
m_Sector->ceilingplane.d = movedest;
|
||||
m_Sector->ceilingplane.setD(movedest);
|
||||
|
||||
// COULD GET CRUSHED
|
||||
flag = P_ChangeSector (m_Sector, crush, -speed, 1, false);
|
||||
|
|
@ -334,7 +332,7 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
m_Sector->ChangePlaneTexZ(sector_t::ceiling, m_Sector->ceilingplane.HeightDiff (lastpos));
|
||||
return crushed;
|
||||
}
|
||||
m_Sector->ceilingplane.d = lastpos;
|
||||
m_Sector->ceilingplane.setD(lastpos);
|
||||
P_ChangeSector (m_Sector, crush, speed, 1, true);
|
||||
MoveAttached(crush, speed, 1, false);
|
||||
return crushed;
|
||||
|
|
@ -352,12 +350,12 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
|
||||
if (!MoveAttached(crush, move, 1, true)) return crushed;
|
||||
|
||||
m_Sector->ceilingplane.d = dest;
|
||||
m_Sector->ceilingplane.setD(dest);
|
||||
|
||||
flag = P_ChangeSector (m_Sector, crush, move, 1, false);
|
||||
if (flag)
|
||||
{
|
||||
m_Sector->ceilingplane.d = lastpos;
|
||||
m_Sector->ceilingplane.setD(lastpos);
|
||||
P_ChangeSector (m_Sector, crush, move, 1, true);
|
||||
MoveAttached(crush, move, 1, false);
|
||||
}
|
||||
|
|
@ -371,12 +369,12 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
|
|||
{
|
||||
if (!MoveAttached(crush, speed, 1, true)) return crushed;
|
||||
|
||||
m_Sector->ceilingplane.d = movedest;
|
||||
m_Sector->ceilingplane.setD(movedest);
|
||||
|
||||
flag = P_ChangeSector (m_Sector, crush, speed, 1, false);
|
||||
if (flag)
|
||||
{
|
||||
m_Sector->ceilingplane.d = lastpos;
|
||||
m_Sector->ceilingplane.setD(lastpos);
|
||||
P_ChangeSector (m_Sector, crush, -speed, 1, true);
|
||||
MoveAttached(crush, -speed, 1, false);
|
||||
return crushed;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue