Disallow SIGIL2.WAD to be [auto]loaded twice

bradharding · Nov 8, 2023 · 7baa7b5 · 7baa7b5
1 parent 2448602
commit 7baa7b5
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/w_wad.c b/src/w_wad.c
@@ -294,6 +294,7 @@ bool W_AddFile(char *filename, bool autoloaded)
 {
     static bool resourcewadadded;
     static bool sigilwadadded;
+    static bool sigil2wadadded;
     static bool nervewadadded;
     wadinfo_t   header;
     size_t      length;
@@ -329,6 +330,11 @@ bool W_AddFile(char *filename, bool autoloaded)
     else if (buckethead && (M_StringCompare(file, "SIGIL_SHREDS.wad")
         || M_StringCompare(file, "SIGIL_SHREDS_COMPAT.wad")))
         return false;
+    else if (sigil2wadadded && D_IsSIGIL2WAD(file))
+        return false;
+    else if (thorr && (M_StringCompare(file, "SIGIL2_SHREDS.wad")
+        || M_StringCompare(file, "SIGIL2_SHREDS_COMPAT.wad")))
+        return false;
     else if (nervewadadded && M_StringCompare(file, "NERVE.WAD"))
         return false;
 
@@ -410,7 +416,7 @@ bool W_AddFile(char *filename, bool autoloaded)
         }
         else if (D_IsSIGIL2WAD(file))
         {
-            sigilwadadded = true;
+            sigil2wadadded = true;
             autosigil2 = autoloaded;
             C_Output("You can now play John Romero's " ITALICS("SIGIL II")
                 " by choosing it in the episode menu.");