diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp
index 146ea5673..bf0ac910f 100644
--- a/src/r_bsp.cpp
+++ b/src/r_bsp.cpp
@@ -821,7 +821,6 @@ void FWallTmapVals::InitFromWallCoords(const FWallCoords *wallc)
 		InvZorg = (float)(wallc->tx1 - wallc->tx2) * centerx;
 		InvZstep = (float)(wallc->ty2 - wallc->ty1);
 	}
-	InitDepth();
 }
 
 void FWallTmapVals::InitFromLine(int tx1, int ty1, int tx2, int ty2)
@@ -841,13 +840,6 @@ void FWallTmapVals::InitFromLine(int tx1, int ty1, int tx2, int ty2)
 	UoverZstep = (float)(-fully1);
 	InvZorg = (float)(fullx1 - fullx2) * centerx;
 	InvZstep = (float)(fully2 - fully1);
-	InitDepth();
-}
-
-void FWallTmapVals::InitDepth()
-{
-	DepthScale = InvZstep * WallTMapScale2;
-	DepthOrg = -UoverZstep * WallTMapScale2;
 }
 
 //
diff --git a/src/r_bsp.h b/src/r_bsp.h
index 1b5af9805..acd519c62 100644
--- a/src/r_bsp.h
+++ b/src/r_bsp.h
@@ -44,13 +44,11 @@ struct FWallCoords
 
 struct FWallTmapVals
 {
-	float		DepthOrg, DepthScale;
 	float		UoverZorg, UoverZstep;
 	float		InvZorg, InvZstep;
 
 	void InitFromWallCoords(const FWallCoords *wallc);
 	void InitFromLine(int x1, int y1, int x2, int y2);
-	void InitDepth();
 };
 
 extern FWallCoords WallC;
diff --git a/src/r_segs.cpp b/src/r_segs.cpp
index 15f736c93..cf00abc45 100644
--- a/src/r_segs.cpp
+++ b/src/r_segs.cpp
@@ -2893,6 +2893,8 @@ void PrepWall (fixed_t *swall, fixed_t *lwall, fixed_t walxrepeat, int x1, int x
 { // swall = scale, lwall = texturecolumn
 	double top, bot, i;
 	double xrepeat = fabs((double)walxrepeat);
+	double depth_scale = WallT.InvZstep * WallTMapScale2;
+	double depth_org = -WallT.UoverZstep * WallTMapScale2;
 
 	i = x1 - centerx;
 	top = WallT.UoverZorg + WallT.UoverZstep * i;
@@ -2909,7 +2911,7 @@ void PrepWall (fixed_t *swall, fixed_t *lwall, fixed_t walxrepeat, int x1, int x
 		{
 			lwall[x] = xs_RoundToInt(frac * xrepeat);
 		}
-		swall[x] = xs_RoundToInt(frac * WallT.DepthScale + WallT.DepthOrg);
+		swall[x] = xs_RoundToInt(frac * depth_scale + depth_org);
 		top += WallT.UoverZstep;
 		bot += WallT.InvZstep;
 	}