From 37aa4c2c28900907929b05c8c95ef9439622331d Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Fri, 27 Feb 2009 03:45:14 +0000
Subject: [PATCH] - Removed an early-out in wallscan_striped() that is invalid
 when drawing a   skybox.

SVN r1451 (trunk)
---
 docs/rh-log.txt | 6 +++++-
 src/r_segs.cpp  | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 1856eee6e3..d8c9ec5556 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,8 @@
-February 25, 2009  (Changes by Graf Zahl)
+February 26, 2009
+- Removed an early-out in wallscan_striped() that is invalid when drawing a
+  skybox.
+
+February 25, 2009  (Changes by Graf Zahl)
 - fixed: nextmap and nextsecret CCMDs set skill to 0.
 - fixed: level.flags2 was not stored in savegames. Also bumped min. savegame
   version and removed old compatibility handlings.
diff --git a/src/r_segs.cpp b/src/r_segs.cpp
index d2c7accdfd..e745cb70ac 100644
--- a/src/r_segs.cpp
+++ b/src/r_segs.cpp
@@ -589,6 +589,9 @@ void wallscan_striped (int x1, int x2, short *uwal, short *dwal, fixed_t *swal,
 	up = uwal;
 	down = most1;
 
+	assert(WallSX1 <= x1);
+	assert(WallSX2 > x2);
+
 	for (int i = 0; i < el->NumUsedLights; ++i)
 	{
 		if (flooding && !el->Lights[i].bFlooder)
@@ -605,7 +608,7 @@ void wallscan_striped (int x1, int x2, short *uwal, short *dwal, fixed_t *swal,
 				//break;
 			}
 
-			if (j != 3 && (most3[x1] > up[x1] || most3[x2] > up[x2]))
+			if (j != 3 /*&& (most3[x1] > up[x1] || most3[x2] > up[x2])*/)
 			{
 				for (int j = x1; j <= x2; ++j)
 				{