From 774e559eafcf69eeb02c6e87ff725e5115039fa6 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 16 Aug 2008 20:47:41 +0000
Subject: [PATCH] - Last commit was incomplete.

SVN r1175 (trunk)
---
 src/dsectoreffect.cpp   |  2 +-
 src/p_floor.cpp         |  2 +-
 src/p_linkedsectors.cpp |  2 +-
 src/p_sectors.cpp       | 12 ++++++------
 src/p_slopes.cpp        |  4 ++--
 src/r_interpolate.cpp   |  3 +--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/dsectoreffect.cpp b/src/dsectoreffect.cpp
index 93c2a17b0e..48e58d0a9c 100644
--- a/src/dsectoreffect.cpp
+++ b/src/dsectoreffect.cpp
@@ -270,7 +270,7 @@ DMover::EResult DMover::MovePlane (fixed_t speed, fixed_t dest, int crush,
 					MoveAttached(crush, -speed, 0, false);
 					return crushed;
 				}
-				m_Sector->ChangePlaneTexZ(sector_t::floortexz, m_Sector->floorplane.HeightDiff (lastpos));
+				m_Sector->ChangePlaneTexZ(sector_t::floor, m_Sector->floorplane.HeightDiff (lastpos));
 				m_Sector->AdjustFloorClip ();
 			}
 			break;
diff --git a/src/p_floor.cpp b/src/p_floor.cpp
index a2c846ca6a..3692a34c46 100644
--- a/src/p_floor.cpp
+++ b/src/p_floor.cpp
@@ -1157,7 +1157,7 @@ void DWaggleBase::DoWaggle (bool ceiling)
 	dist = plane->d;
 	plane->d = m_OriginalDist + plane->PointToDist (0, 0,
 		FixedMul (FloatBobOffsets[(m_Accumulator>>FRACBITS)&63], m_Scale));
-	*texz += plane->HeightDiff (dist);
+	m_Sector->ChangePlaneTexZ(pos, plane->HeightDiff (dist));
 	dist = plane->HeightDiff (dist);
 	P_ChangeSector (m_Sector, true, dist, ceiling, false);
 }
diff --git a/src/p_linkedsectors.cpp b/src/p_linkedsectors.cpp
index b5f5e6a78c..ac75f472e9 100644
--- a/src/p_linkedsectors.cpp
+++ b/src/p_linkedsectors.cpp
@@ -107,7 +107,7 @@ static bool MoveCeiling(sector_t *sector, int crush, fixed_t move)
 static bool MoveFloor(sector_t *sector, int crush, fixed_t move)
 {
 	sector->floorplane.ChangeHeight (move);
-	sector->ChangePlaneTexZ(sector_t::floortexz, move);
+	sector->ChangePlaneTexZ(sector_t::floor, move);
 
 	if (P_ChangeSector(sector, crush, move, 0, true)) return false;
 
diff --git a/src/p_sectors.cpp b/src/p_sectors.cpp
index cccb53052b..7f420a7cd5 100644
--- a/src/p_sectors.cpp
+++ b/src/p_sectors.cpp
@@ -107,7 +107,7 @@ fixed_t sector_t::FindHighestFloorSurrounding (vertex_t **v) const
 	fixed_t ofloor;
 	vertex_t *spot;
 
-	if (linecount == 0) return floortexz;
+	if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
 
 	spot = lines[0]->v1;
 	floor = FIXED_MIN;
@@ -158,7 +158,7 @@ fixed_t sector_t::FindNextHighestFloor (vertex_t **v) const
 	line_t *check;
 	int i;
 
-	if (linecount == 0) return floortexz;
+	if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
 
 	spot = lines[0]->v1;
 	height = floorplane.ZatPoint (spot);
@@ -213,7 +213,7 @@ fixed_t sector_t::FindNextLowestFloor (vertex_t **v) const
 	line_t *check;
 	int i;
 
-	if (linecount == 0) return floortexz;
+	if (linecount == 0) return GetPlaneTexZ(sector_t::floor);
 
 	spot = lines[0]->v1;
 	height = floorplane.ZatPoint (spot);
@@ -324,7 +324,7 @@ fixed_t sector_t::FindNextHighestCeiling (vertex_t **v) const
 	line_t *check;
 	int i;
 
-	if (linecount == 0) return ceilingtexz;
+	if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
 
 	spot = lines[0]->v1;
 	height = ceilingplane.ZatPoint (spot);
@@ -370,7 +370,7 @@ fixed_t sector_t::FindLowestCeilingSurrounding (vertex_t **v) const
 	line_t *check;
 	int i;
 
-	if (linecount == 0) return ceilingtexz;
+	if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
 
 	spot = lines[0]->v1;
 	height = FIXED_MAX;
@@ -412,7 +412,7 @@ fixed_t sector_t::FindHighestCeilingSurrounding (vertex_t **v) const
 	line_t *check;
 	int i;
 
-	if (linecount == 0) return ceilingtexz;
+	if (linecount == 0) return GetPlaneTexZ(sector_t::ceiling);
 
 	spot = lines[0]->v1;
 	height = FIXED_MIN;
diff --git a/src/p_slopes.cpp b/src/p_slopes.cpp
index e3501a337e..915844aae3 100644
--- a/src/p_slopes.cpp
+++ b/src/p_slopes.cpp
@@ -498,8 +498,8 @@ static void P_AlignPlane (sector_t *sec, line_t *line, int which)
 
 	refplane = (which == 0) ? &refsec->floorplane : &refsec->ceilingplane;
 	srcplane = (which == 0) ? &sec->floorplane : &sec->ceilingplane;
-	srcheight = (which == 0) ? sec->floortexz : sec->ceilingtexz;
-	destheight = (which == 0) ? refsec->floortexz : refsec->ceilingtexz;
+	srcheight = (which == 0) ? sec->GetPlaneTexZ(sector_t::floor) : sec->GetPlaneTexZ(sector_t::ceiling);
+	destheight = (which == 0) ? refsec->GetPlaneTexZ(sector_t::floor) : refsec->GetPlaneTexZ(sector_t::ceiling);
 
 	p[0] = FIXED2FLOAT (line->v1->x);
 	p[1] = FIXED2FLOAT (line->v1->y);
diff --git a/src/r_interpolate.cpp b/src/r_interpolate.cpp
index 0b16fd4385..532737c91d 100644
--- a/src/r_interpolate.cpp
+++ b/src/r_interpolate.cpp
@@ -454,7 +454,7 @@ void DSectorPlaneInterpolation::Restore()
 	else
 	{
 		sector->ceilingplane.d = bakheight;
-		sector->GetPlaneTexZ(sector_t::ceiling, baktexz?;
+		sector->SetPlaneTexZ(sector_t::ceiling, baktexz);
 	}
 }
 
@@ -468,7 +468,6 @@ void DSectorPlaneInterpolation::Interpolate(fixed_t smoothratio)
 {
 	fixed_t *pheight;
 	int pos;
-	fixed_t *ptexz;
 
 	if (!ceiling)
 	{