From 9abadd0a12e571922161801869b6d0b063e1caba Mon Sep 17 00:00:00 2001
From: Joseph Carter <knghtbrd@debian.org>
Date: Thu, 13 Apr 2000 01:34:01 +0000
Subject: [PATCH] Rearranging things a little for colored lights.

---
 common/cl_tent.c  |  6 +++---
 common/gl_rsurf.c | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/common/cl_tent.c b/common/cl_tent.c
index 80cb38c..eb07d41 100644
--- a/common/cl_tent.c
+++ b/common/cl_tent.c
@@ -271,9 +271,9 @@ CL_ParseTEnt (void)
 		dl->radius = 350;
 		dl->die = cl.time + 0.5;
 		dl->decay = 300;
-		dl->color[0] = 0.2;
-		dl->color[1] = 0.1;
-		dl->color[2] = 0.05;
+		dl->color[0] = 0.86;
+		dl->color[1] = 0.31;
+		dl->color[2] = 0.24;
 		dl->color[3] = 0.7;
 
 	// sound
diff --git a/common/gl_rsurf.c b/common/gl_rsurf.c
index aa7ed2b..17d1fdd 100644
--- a/common/gl_rsurf.c
+++ b/common/gl_rsurf.c
@@ -205,9 +205,9 @@ void R_BuildLightMap (msurface_t *surf, byte *dest, int stride)
 		{
 			scale = d_lightstylevalue[surf->styles[maps]];
 			surf->cached_light[maps] = scale;	// 8.8 fraction
-			for (i=0, j=0 ; i<size ; i++)
+			if (bspver == CBSPVERSION)
 			{
-				if (bspver == CBSPVERSION)
+				for (i=0, j=0 ; i<size ; i++)
 				{
 					cblocklights[0][i] +=
 						lightmap[j++] * scale;
@@ -215,17 +215,24 @@ void R_BuildLightMap (msurface_t *surf, byte *dest, int stride)
 						lightmap[j++] * scale;
 					cblocklights[2][i] +=
 						lightmap[j++] * scale;
-				} else {
+					blocklights[i] += 
+						lightmap[j++] * scale;
+				}
+				lightmap += (size<<2);
+			} else {
+				for (i=0 ; i<size ; i++)
+				{
 					cblocklights[0][i] +=
 						lightmap[i] * scale;
 					cblocklights[1][i] +=
 						lightmap[i] * scale;
 					cblocklights[2][i] +=
 						lightmap[i] * scale;
+					blocklights[i] +=
+						lightmap[i] * scale;
 				}
-				blocklights[i] += lightmap[j++] * scale;
+				lightmap += size;
 			}
-			lightmap += size;	// skip to next lightmap
 		}
 
 // add all the dynamic lights
@@ -237,6 +244,7 @@ store:
 	switch (gl_lightmap_format)
 	{
 	case GL_RGBA:
+	case GL_RGBA4:
 		stride -= (smax<<2);
 		rbl = cblocklights[0];
 		gbl = cblocklights[1];