From db4472b06718d0044bfcdb0ec9d411267619fba2 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Fri, 6 Dec 2024 20:58:12 +0100
Subject: [PATCH] Maps with a ZDRayInfo must always have dynamic lights
 (gl_lights cvar is ignored in this situation)

---
 src/g_cvars.cpp          | 7 +++++--
 src/playsim/dthinker.cpp | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/g_cvars.cpp b/src/g_cvars.cpp
index 513fce03b..8c412798a 100644
--- a/src/g_cvars.cpp
+++ b/src/g_cvars.cpp
@@ -77,8 +77,11 @@ CUSTOM_CVAR (Bool, gl_lights, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOIN
 {
 	for (auto Level : AllLevels())
 	{
-		if (self) Level->RecreateAllAttachedLights();
-		else Level->DeleteAllAttachedLights();
+		if (!Level->lightmaps)
+		{
+			if (self) Level->RecreateAllAttachedLights();
+			else Level->DeleteAllAttachedLights();
+		}
 	}
 }
 
diff --git a/src/playsim/dthinker.cpp b/src/playsim/dthinker.cpp
index 4229de792..4ee97062d 100644
--- a/src/playsim/dthinker.cpp
+++ b/src/playsim/dthinker.cpp
@@ -109,9 +109,9 @@ void FThinkerCollection::RunThinkers(FLevelLocals *Level)
 	ThinkCycles.Clock();
 
 	bool dolights;
-	if ((gl_lights && vid_rendermode == 4) || (r_dynlights && vid_rendermode != 4))
+	if ((gl_lights && vid_rendermode == 4) || (r_dynlights && vid_rendermode != 4) || Level->lightmaps)
 	{
-		dolights = true;// Level->lights || (Level->flags3 & LEVEL3_LIGHTCREATED);
+		dolights = true;// Level->lights || (Level->flags3 & LEVEL3_LIGHTCREATED) || Level->lightmaps;
 	}
 	else
 	{