From 0d43ecdd9d8d2254960f231d7fc609ec98c626f7 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 5 Jul 2011 21:30:17 +0000
Subject: [PATCH] - moved side_t::GetLightLevel out of software rendering code.

SVN r3252 (trunk)
---
 src/p_sectors.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++++
 src/r_segs.cpp    | 56 --------------------------------------
 2 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/src/p_sectors.cpp b/src/p_sectors.cpp
index b2e1070aa..bec32a7b7 100644
--- a/src/p_sectors.cpp
+++ b/src/p_sectors.cpp
@@ -899,3 +899,71 @@ void subsector_t::BuildPolyBSP()
 		BSP->Subsectors[i].sector = sector;
 	}
 }
+
+//==========================================================================
+//
+//
+//
+//==========================================================================
+
+CUSTOM_CVAR(Int, r_fakecontrast, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+{
+	if (self < 0) self = 1;
+	else if (self > 2) self = 2;
+}
+
+//==========================================================================
+//
+//
+//
+//==========================================================================
+
+int side_t::GetLightLevel (bool foggy, int baselight, int *pfakecontrast) const
+{
+	if (Flags & WALLF_ABSLIGHTING) 
+	{
+		baselight = Light;
+	}
+
+	if (pfakecontrast != NULL)
+	{
+		*pfakecontrast = 0;
+	}
+
+	if (!foggy) // Don't do relative lighting in foggy sectors
+	{
+		if (!(Flags & WALLF_NOFAKECONTRAST) && r_fakecontrast != 0)
+		{
+			int rel;
+			if (((level.flags2 & LEVEL2_SMOOTHLIGHTING) || (Flags & WALLF_SMOOTHLIGHTING) || r_fakecontrast == 2) &&
+				linedef->dx != 0)
+			{
+				rel = xs_RoundToInt // OMG LEE KILLOUGH LIVES! :/
+					(
+						level.WallHorizLight
+						+ fabs(atan(double(linedef->dy) / linedef->dx) / 1.57079)
+						* (level.WallVertLight - level.WallHorizLight)
+					);
+			}
+			else
+			{
+				rel = linedef->dx == 0 ? level.WallVertLight : 
+					  linedef->dy == 0 ? level.WallHorizLight : 0;
+			}
+			if (pfakecontrast != NULL)
+			{
+				*pfakecontrast = rel;
+			}
+			else
+			{
+				baselight += rel;
+			}
+		}
+		if (!(Flags & WALLF_ABSLIGHTING))
+		{
+			baselight += this->Light;
+		}
+	}
+	return baselight;
+}
+
diff --git a/src/r_segs.cpp b/src/r_segs.cpp
index 3eac266e4..4dc1c556d 100644
--- a/src/r_segs.cpp
+++ b/src/r_segs.cpp
@@ -2047,62 +2047,6 @@ void R_NewWall (bool needlights)
 	}
 }
 
-CUSTOM_CVAR(Int, r_fakecontrast, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
-{
-	if (self < 0) self = 1;
-	else if (self > 2) self = 2;
-}
-
-int side_t::GetLightLevel (bool foggy, int baselight, int *pfakecontrast) const
-{
-	if (Flags & WALLF_ABSLIGHTING) 
-	{
-		baselight = Light;
-	}
-
-	if (pfakecontrast != NULL)
-	{
-		*pfakecontrast = 0;
-	}
-
-	if (!foggy) // Don't do relative lighting in foggy sectors
-	{
-		if (!(Flags & WALLF_NOFAKECONTRAST) && r_fakecontrast != 0)
-		{
-			int rel;
-			if (((level.flags2 & LEVEL2_SMOOTHLIGHTING) || (Flags & WALLF_SMOOTHLIGHTING) || r_fakecontrast == 2) &&
-				linedef->dx != 0)
-			{
-				rel = xs_RoundToInt // OMG LEE KILLOUGH LIVES! :/
-					(
-						level.WallHorizLight
-						+ fabs(atan(double(linedef->dy) / linedef->dx) / 1.57079)
-						* (level.WallVertLight - level.WallHorizLight)
-					);
-			}
-			else
-			{
-				rel = linedef->dx == 0 ? level.WallVertLight : 
-					  linedef->dy == 0 ? level.WallHorizLight : 0;
-			}
-			if (pfakecontrast != NULL)
-			{
-				*pfakecontrast = rel;
-			}
-			else
-			{
-				baselight += rel;
-			}
-		}
-		if (!(Flags & WALLF_ABSLIGHTING))
-		{
-			baselight += this->Light;
-		}
-	}
-	return baselight;
-}
-
-
 
 //
 // R_CheckDrawSegs