the -nosideload parameter prevent automatic loading of nerve/masterle…

…vels/sigil Hopefully fixes #792
fabiangreffrath · Dec 13, 2021 · 2f91146 · 2f91146
1 parent 2d1fe97
commit 2f91146
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/src/doom/d_main.c b/src/doom/d_main.c
@@ -1909,7 +1909,7 @@ void D_DoomMain (void)
     W_GenerateHashTable();
 
     // [crispy] allow overriding of special-casing
-    if (!M_ParmExists("-noautoload") && gamemode != shareware)
+    if (!M_ParmExists("-nosideload") && gamemode != shareware)
     {
 	if (gamemode == retail &&
 	    gameversion == exe_ultimate &&

diff --git a/src/doom/d_pwad.c b/src/doom/d_pwad.c
@@ -23,6 +23,7 @@
 #include "doomstat.h"
 #include "deh_main.h"
 #include "d_iwad.h"
+#include "m_argv.h"
 #include "m_config.h"
 #include "m_misc.h"
 #include "w_main.h"
@@ -167,10 +168,13 @@ void D_LoadSigilWad (void)
 	}
 
 	// [crispy] load WAD and DEH files from autoload directories
-	autoload_dir = M_GetAutoloadDir(sigil_basename, false);
-	W_AutoLoadWADs(autoload_dir);
-	DEH_AutoLoadPatches(autoload_dir);
-	free(autoload_dir);
+	if (!M_ParmExists("-noautoload"))
+	{
+		autoload_dir = M_GetAutoloadDir(sigil_basename, false);
+		W_AutoLoadWADs(autoload_dir);
+		DEH_AutoLoadPatches(autoload_dir);
+		free(autoload_dir);
+	}
 
 	// [crispy] regenerate the hashtable
 	W_GenerateHashTable();
@@ -278,10 +282,13 @@ static void CheckLoadNerve (void)
 	}
 
 	// [crispy] load WAD and DEH files from autoload directories
-	autoload_dir = M_GetAutoloadDir(nerve_basename, false);
-	W_AutoLoadWADs(autoload_dir);
-	DEH_AutoLoadPatches(autoload_dir);
-	free(autoload_dir);
+	if (!M_ParmExists("-noautoload"))
+	{
+		autoload_dir = M_GetAutoloadDir(nerve_basename, false);
+		W_AutoLoadWADs(autoload_dir);
+		DEH_AutoLoadPatches(autoload_dir);
+		free(autoload_dir);
+	}
 
 	// [crispy] regenerate the hashtable
 	W_GenerateHashTable();
@@ -382,10 +389,13 @@ static boolean CheckLoadMasterlevels (void)
 	}
 
 	// [crispy] load WAD and DEH files from autoload directories
-	autoload_dir = M_GetAutoloadDir(master_basename, false);
-	W_AutoLoadWADs(autoload_dir);
-	DEH_AutoLoadPatches(autoload_dir);
-	free(autoload_dir);
+	if (!M_ParmExists("-noautoload"))
+	{
+		autoload_dir = M_GetAutoloadDir(master_basename, false);
+		W_AutoLoadWADs(autoload_dir);
+		DEH_AutoLoadPatches(autoload_dir);
+		free(autoload_dir);
+	}
 
 	// [crispy] regenerate the hashtable
 	W_GenerateHashTable();