diff --git a/source/core/automap.cpp b/source/core/automap.cpp
index e36a9a0b0..2eb158623 100644
--- a/source/core/automap.cpp
+++ b/source/core/automap.cpp
@@ -306,7 +306,7 @@ void MarkSectorSeen(sectortype* sec)
 			if (wal.nextWall()->cstat & bits) continue;
 			auto osec = wal.nextSector();
 			if (osec->lotag == 32767) continue;
-			if (osec->int_ceilingz() >= osec->int_floorz()) continue;
+			if (osec->ceilingz >= osec->floorz) continue;
 			show2dsector.Set(sectnum(osec));
 		}
 	}
@@ -420,8 +420,8 @@ void drawredlines(int cposx, int cposy, int czoom, int cang)
 	{
 		if (!gFullMap && !show2dsector[i]) continue;
 
-		int z1 = sector[i].int_ceilingz();
-		int z2 = sector[i].int_floorz();
+		double z1 = sector[i].ceilingz;
+		double z2 = sector[i].floorz;
 
 		for (auto& wal : wallsofsector(i))
 		{
@@ -429,7 +429,7 @@ void drawredlines(int cposx, int cposy, int czoom, int cang)
 
 			auto osec = wal.nextSector();
 
-			if (osec->int_ceilingz() == z1 && osec->int_floorz() == z2)
+			if (osec->ceilingz == z1 && osec->floorz == z2)
 				if (((wal.cstat | wal.nextWall()->cstat) & (CSTAT_WALL_MASKED | CSTAT_WALL_1WAY)) == 0) continue;
 
 			if (ShowRedLine(wallnum(&wal), i))
diff --git a/source/core/rendering/scene/hw_flats.cpp b/source/core/rendering/scene/hw_flats.cpp
index 19f0c8cf5..37e39a5ea 100644
--- a/source/core/rendering/scene/hw_flats.cpp
+++ b/source/core/rendering/scene/hw_flats.cpp
@@ -104,7 +104,7 @@ void HWFlat::MakeVertices(HWDrawInfo* di)
 
 		auto ret = screen->mVertexData->AllocVertices(pIndices->Size());
 		auto vp = ret.first;
-		float base = (plane == 0 ? sec->int_floorz() : sec->int_ceilingz()) * (1 / -256.f);
+		float base = -(plane == 0 ? sec->floorz : sec->ceilingz);
 		for (unsigned i = 0; i < pIndices->Size(); i++)
 		{
 			auto ii = (*pIndices)[i];
diff --git a/source/core/rendering/scene/hw_walls.cpp b/source/core/rendering/scene/hw_walls.cpp
index 2cfa95a6a..5b59058dc 100644
--- a/source/core/rendering/scene/hw_walls.cpp
+++ b/source/core/rendering/scene/hw_walls.cpp
@@ -753,7 +753,7 @@ void HWWall::DoTexture(HWDrawInfo* di, walltype* wal, walltype* refwall, float r
 	auto setv = [=](float hl, float hr, float frac) -> float
 	{
 		float h = hl + (hr - hl) * frac;
-		h = (-(float)(refheight + (h * 256)) / ((th * 2048.0f) / (float)(wal->yrepeat))) + ypanning;
+		h = (-(float)((refheight + h) * 256) / ((th * 2048.0f) / (float)(wal->yrepeat))) + ypanning;
 		if (refwall->cstat & CSTAT_WALL_YFLIP) h = -h;
 		return h;
 	};
@@ -784,19 +784,19 @@ void HWWall::DoOneSidedTexture(HWDrawInfo* di, walltype* wal, sectortype* fronts
 	float topleft, float topright, float bottomleft, float bottomright)
 {
 	// get the alignment reference position.
-	int refheight;
+	float refheight;
 
 	if ((wal->cstat & CSTAT_WALL_1WAY) && backsector)
 	{
 		if ((!(wal->cstat & CSTAT_WALL_BOTTOM_SWAP) && (wal->cstat & CSTAT_WALL_1WAY)) ||
 			((wal->cstat & CSTAT_WALL_BOTTOM_SWAP) && (wal->nextWall()->cstat & CSTAT_WALL_ALIGN_BOTTOM)))
-			refheight = frontsector->int_ceilingz();
+			refheight = frontsector->ceilingz;
 		else
-			refheight = backsector->int_floorz();
+			refheight = backsector->floorz;
 	}
 	else
 	{
-		refheight = (wal->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->int_floorz() : frontsector->int_ceilingz();
+		refheight = (wal->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->floorz : frontsector->ceilingz;
 	}
 
 	type = RENDERWALL_M1S;
@@ -813,7 +813,7 @@ void HWWall::DoUpperTexture(HWDrawInfo* di, walltype* wal, sectortype* frontsect
 	float topleft, float topright, float bottomleft, float bottomright)
 {
 	// get the alignment reference position.
-	int refheight = (wal->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->int_ceilingz() : backsector->int_ceilingz();
+	float refheight = (wal->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->ceilingz : backsector->ceilingz;
 
 	type = RENDERWALL_TOP;
 	DoTexture(di, wal, wal, refheight, topleft, topright, bottomleft, bottomright);
@@ -829,9 +829,8 @@ void HWWall::DoLowerTexture(HWDrawInfo* di, walltype* wal, sectortype* frontsect
 	float topleft, float topright, float bottomleft, float bottomright)
 {
 	// get the alignment reference position.
-	int refheight;
 	auto refwall = (wal->cstat & CSTAT_WALL_BOTTOM_SWAP) ? wal->nextWall() : wal;
-	refheight = (refwall->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->int_ceilingz() : backsector->int_floorz();
+	float refheight = (refwall->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->ceilingz : backsector->floorz;
 
 	shade = refwall->shade;
 	palette = refwall->pal;
@@ -851,22 +850,22 @@ void HWWall::DoMidTexture(HWDrawInfo* di, walltype* wal,
 	float bch1, float bch2, float bfh1, float bfh2)
 {
 	float topleft,bottomleft,topright,bottomright;
-	int refheight;
+	float refheight;
 
 	const int swapit = (wal->cstat & CSTAT_WALL_ALIGN_BOTTOM);
 
 	if (wal->cstat & CSTAT_WALL_1WAY)
 	{
 		// 1-sided wall
-		refheight = swapit ? front->int_ceilingz() : back->int_ceilingz();
+		refheight = swapit ? front->ceilingz : back->ceilingz;
 	}
 	else
 	{
 		// masked wall
 		if (swapit)
-			refheight = min(front->int_floorz(), back->int_floorz());
+			refheight = min(front->floorz, back->floorz);
 		else
-			refheight = max(front->int_ceilingz(), back->int_ceilingz());
+			refheight = max(front->ceilingz, back->ceilingz);
 	}
 	if ((bch1 - fch1) * (bch2 - fch2) >= 0)
 	{