From bdc0950e012e38508891367ce158842c885d585f Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sat, 29 Aug 2009 03:33:36 +0000
Subject: [PATCH] - Fixed: The first lighting plane added to a light stack had
 the bOverlaps   flag set, causing it to be ignored during rendering. Why this
 didn't cause   more trouble, I don't know. - Fixed: The UDMF parser passed
 the wrong value for "default alpha" for   TranslucentLine to
 P_FinishLoadingLineDef().

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

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index d2ea6e2fd4..9283447f8d 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,9 @@
 August 28, 2009
+- Fixed: The first lighting plane added to a light stack had the bOverlaps
+  flag set, causing it to be ignored during rendering. Why this didn't cause
+  more trouble, I don't know.
+- Fixed: The UDMF parser passed the wrong value for "default alpha" for
+  TranslucentLine to P_FinishLoadingLineDef().
 - Fixed: genStringEnter mode acted on key up events rather than key repeat
   events.
 
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 19a9219efb..95ca52a661 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -1771,7 +1771,7 @@ void P_FinishLoadingLineDef(line_t *ld, int alpha)
 
 	case TranslucentLine:			// killough 4/11/98: translucent 2s textures
 		// [RH] Second arg controls how opaque it is.
-		if (alpha == -32767)
+		if (alpha == SHRT_MIN)
 		{
 			alpha = ld->args[1];
 			additive = !!ld->args[2];
@@ -2002,7 +2002,7 @@ static void P_AllocateSideDefs (int count)
 	for (i = 0; i < count; i++)
 	{
 		sidetemp[i].a.special = sidetemp[i].a.tag = 0;
-		sidetemp[i].a.alpha = -32767;
+		sidetemp[i].a.alpha = SHRT_MIN;
 		sidetemp[i].a.map = NO_SIDE;
 	}
 	if (count < numsides)
@@ -2988,7 +2988,7 @@ void FExtraLight::InsertLight (const secplane_t &inplane, line_t *line, int type
 
 	vertex_t **triangle = line->frontsector->Triangle;
 	int i, j;
-	fixed_t diff = 0;
+	fixed_t diff = FIXED_MAX;
 	secplane_t plane = inplane;
 
 	if (type != 2)
diff --git a/src/p_udmf.cpp b/src/p_udmf.cpp
index a9e6e5eedd..5c066f5312 100644
--- a/src/p_udmf.cpp
+++ b/src/p_udmf.cpp
@@ -1296,7 +1296,7 @@ struct UDMFParser
 
 		for(int line = 0, side = 0; line < numlines; line++)
 		{
-			short tempalpha[2] = {-1,-1};
+			short tempalpha[2] = { SHRT_MIN, SHRT_MIN };
 
 			lines[line] = ParsedLines[line];
 
diff --git a/src/r_segs.cpp b/src/r_segs.cpp
index 5bcbafc234..db076362a4 100644
--- a/src/r_segs.cpp
+++ b/src/r_segs.cpp
@@ -615,11 +615,6 @@ void wallscan_striped (int x1, int x2, short *uwal, short *dwal, fixed_t *swal,
 		{
 			int j = WallMost (most3, el->Lights[i].Plane);
 
-			if (most3[x1] > dwal[x1] && most3[x2] > dwal[x2])
-			{ // Done - does not work as well as I thought it would
-				//break;
-			}
-
 			if (j != 3 /*&& (most3[x1] > up[x1] || most3[x2] > up[x2])*/)
 			{
 				for (int j = x1; j <= x2; ++j)