From 6ab8e90911c310b918421a71d781fa1337b834df Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Mon, 2 Jan 2017 00:28:30 +0100
Subject: [PATCH] - parse GLDEFS and its game-specific variants in lump order
 instead of both names sequentially.

---
 src/gl/dynlights/gl_dynlight.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gl/dynlights/gl_dynlight.cpp b/src/gl/dynlights/gl_dynlight.cpp
index de05bb19f..8e3fa34df 100644
--- a/src/gl/dynlights/gl_dynlight.cpp
+++ b/src/gl/dynlights/gl_dynlight.cpp
@@ -48,6 +48,7 @@
 #include "stats.h"
 #include "zstring.h"
 #include "d_dehacked.h"
+#include "v_text.h"
 
 
 #include "gl/dynlights/gl_dynlight.h"
@@ -1336,12 +1337,13 @@ void gl_DoParseDefs(FScanner &sc, int workingLump)
 //
 //==========================================================================
 
-void gl_LoadGLDefs(const char * defsLump)
+void gl_LoadGLDefs(const char *defsLump)
 {
 	int workingLump, lastLump;
+	static const char *gldefsnames[] = { "GLDEFS", defsLump, nullptr };
 
 	lastLump = 0;
-	while ((workingLump = Wads.FindLump(defsLump, &lastLump)) != -1)
+	while ((workingLump = Wads.FindLumpMulti(gldefsnames, &lastLump)) != -1)
 	{
 		FScanner sc(workingLump);
 		gl_DoParseDefs(sc, workingLump);
@@ -1383,8 +1385,7 @@ void gl_ParseDefs()
 		break;
 	}
 	gl_ParseVavoomSkybox();
-	if (defsLump != NULL) gl_LoadGLDefs(defsLump);
-	gl_LoadGLDefs("GLDEFS");
+	gl_LoadGLDefs(defsLump);
 	gl_InitializeActorLights();
 }