From f688882d3e79febce54cdb74706a78d838edb094 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Mon, 1 Jun 2020 01:30:31 +0000
Subject: [PATCH] Fix r_dynamic.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5699 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/r_surf.c | 14 ++++++++------
 engine/gl/gl_rlight.c  |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/engine/client/r_surf.c b/engine/client/r_surf.c
index 4df35f868..0c68e5a07 100644
--- a/engine/client/r_surf.c
+++ b/engine/client/r_surf.c
@@ -57,6 +57,8 @@ extern cvar_t r_stainfadeammount;
 extern cvar_t r_lightmap_nearest;
 extern cvar_t r_lightmap_format;
 
+extern int r_dlightframecount;
+
 static void Surf_FreeLightmap(lightmapinfo_t *lm);
 
 static int lightmap_shift;
@@ -691,7 +693,7 @@ static void Surf_BuildDeluxMap (model_t *wmodel, msurface_t *surf, qbyte *dest,
 
 store:
 	// add all the dynamic lights
-//	if (surf->dlightframe == r_framecount)
+//	if (surf->dlightframe == r_dlightframecount)
 //		GLR_AddDynamicLightNorms (surf);
 
 // bound, invert, and shift
@@ -1361,7 +1363,7 @@ static void Surf_BuildLightMap (model_t *currentmodel, msurface_t *surf, int map
 	qbyte		*src = surf->samples;
 
 	shift += 7; // increase to base value
-	surf->cached_dlight = (surf->dlightframe == r_framecount);
+	surf->cached_dlight = (surf->dlightframe == r_dlightframecount);
 
 	if (size > maxblocksize)
 	{	//fixme: fill in?
@@ -1546,7 +1548,7 @@ static void Surf_BuildLightMap (model_t *currentmodel, msurface_t *surf, int map
 		}
 
 		// add all the dynamic lights
-		if (surf->dlightframe == r_framecount)
+		if (surf->dlightframe == r_dlightframecount)
 			Surf_AddDynamicLights_RGB (surf);
 
 		Surf_StoreLightmap_RGB(dest, blocklights, smax, tmax, shift, stainsrc, lm);
@@ -1648,7 +1650,7 @@ static void Surf_BuildLightMap (model_t *currentmodel, msurface_t *surf, int map
 				}
 			}
 // add all the dynamic lights
-			if (surf->dlightframe == r_framecount)
+			if (surf->dlightframe == r_dlightframecount)
 				Surf_AddDynamicLights_Lum (surf);
 		}
 
@@ -1988,7 +1990,7 @@ void Surf_RenderDynamicLightmaps (msurface_t *fa)
 				goto dynamic;
 	}
 
-	if (fa->dlightframe == r_framecount	// dynamic this frame
+	if (fa->dlightframe == r_dlightframecount	// dynamic this frame
 		|| fa->cached_dlight)			// dynamic previously
 	{
 		RSpeedLocals();
@@ -2057,7 +2059,7 @@ void Surf_RenderAmbientLightmaps (msurface_t *fa, int ambient)
 	if (fa->cached_light[0] != ambient || fa->cached_colour[0] != 0xff)
 		goto dynamic;
 
-	if (fa->dlightframe == r_framecount	// dynamic this frame
+	if (fa->dlightframe == r_dlightframecount	// dynamic this frame
 		|| fa->cached_dlight)			// dynamic previously
 	{
 		RSpeedLocals();
diff --git a/engine/gl/gl_rlight.c b/engine/gl/gl_rlight.c
index fbf44832e..c7f366dc5 100644
--- a/engine/gl/gl_rlight.c
+++ b/engine/gl/gl_rlight.c
@@ -750,7 +750,7 @@ void R_PushDlights (void)
 	{
 		if (!l->radius || !(l->flags & LFLAG_LIGHTMAP))
 			continue;
-		currentmodel->funcs.MarkLights( l, 1<<i, currentmodel->nodes );
+		currentmodel->funcs.MarkLights( l, (dlightbitmask_t)1u<<i, currentmodel->nodes );
 	}
 }