From 81334809c4340c5332a53af83f6bcb5851e514b1 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 30 Jul 2013 09:32:33 +0200
Subject: [PATCH] - changed autoloading of *.deh lumps: it is now controlled by
 a CVAR with 3 options: never load *.deh lumps, load all of them or only load
 the last one. *.deh loading is disabled by default.

---
 src/d_dehacked.cpp        | 44 ++++++++++++++++++++++++++-------------
 wadsrc/static/menudef.txt |  8 +++++++
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp
index 82ba21eba..eb4e2fcd6 100644
--- a/src/d_dehacked.cpp
+++ b/src/d_dehacked.cpp
@@ -2329,6 +2329,18 @@ static int DoInclude (int dummy)
 	return GetLine();
 }
 
+CVAR(Int, dehload, 0, CVAR_ARCHIVE)	// Autoloading of .DEH lumps is disabled by default.
+
+// checks if lump is a .deh or .bex file. Only lumps in the root directory are considered valid.
+static bool isDehFile(int lumpnum)
+{
+	const char* const fullName  = Wads.GetLumpFullName(lumpnum);
+	const char* const extension = strrchr(fullName, '.');
+
+	return NULL != extension && strchr(fullName, '/') == NULL
+		&& (0 == stricmp(extension, ".deh") || 0 == stricmp(extension, ".bex"));
+}
+
 int D_LoadDehLumps()
 {
 	int lastlump = 0, lumpnum, count = 0;
@@ -2338,28 +2350,32 @@ int D_LoadDehLumps()
 		count += D_LoadDehLump(lumpnum);
 	}
 
-#if 0	// commented out for 'maint' version.
-	if (0 == PatchSize)
+	if (0 == PatchSize && dehload > 0)
 	{
 		// No DEH/BEX patch is loaded yet, try to find lump(s) with specific extensions
 
-		for (lumpnum = 0, lastlump = Wads.GetNumLumps();
-			 lumpnum < lastlump;
-			 ++lumpnum)
+		if (dehload == 1)	// load all .DEH lumps that are found.
 		{
-			const char* const fullName  = Wads.GetLumpFullName(lumpnum);
-			const char* const extension = strrchr(fullName, '.');
-
-			const bool isDehOrBex = NULL != extension
-				&& (0 == stricmp(extension, ".deh") || 0 == stricmp(extension, ".bex"));
-
-			if (isDehOrBex)
+			for (lumpnum = 0, lastlump = Wads.GetNumLumps(); lumpnum < lastlump; ++lumpnum)
 			{
-				count += D_LoadDehLump(lumpnum);
+				if (isDehFile(lumpnum))
+				{
+					count += D_LoadDehLump(lumpnum);
+				}
+			}
+		}
+		else 	// only load the last .DEH lump that is found.
+		{
+			for (lumpnum = Wads.GetNumLumps()-1; lumpnum >=0; --lumpnum)
+			{
+				if (isDehFile(lumpnum))
+				{
+					count += D_LoadDehLump(lumpnum);
+					break;
+				}
 			}
 		}
 	}
-#endif
 
 	return count;
 }
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 21f19c106..12201e379 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -850,6 +850,13 @@ OptionValue Autosave
 	2,	"Never"
 }
 
+OptionValue dehopt
+{
+	0,	"Never"
+	1,	"All"
+	2,	"Only last one"
+}
+
 OptionMenu "MiscOptions"
 {
 	Title "Miscellaneous Options"
@@ -864,6 +871,7 @@ OptionMenu "MiscOptions"
 	Option "Enable cheats from all games",			"allcheats", "OnOff"
 	Option "Enable autosaves",						"disableautosave", "Autosave"
 	Slider "Number of autosaves",					"autosavecount", 1, 20, 1, 0
+	Option "Load *.deh/*.bex lumps",				"dehload", "dehopt"
 	StaticText " "
 	Option "Cache nodes",							"gl_cachenodes", "OnOff"
 	Slider "Time threshold for node caching",		"gl_cachetime", 0.0, 2.0, 0.1