don't autoload from doom-all for unknown IWADs (#2208)

fabiangreffrath · Feb 19, 2025 · 926c90b · 926c90b
1 parent e3d74f9
commit 926c90b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/d_iwad.c b/src/d_iwad.c
@@ -854,9 +854,11 @@ void D_GetModeAndMissionByIWADName(const char *name, GameMode_t *mode,
         {
             *mode = iwads[i].mode;
             *mission = iwads[i].mission;
-            break;
+            return;
         }
     }
+    *mode = indetermined;
+    *mission = none;
 }
 
 const char *D_GetIWADDescription(const char *name, GameMode_t mode,

diff --git a/src/d_main.c b/src/d_main.c
@@ -1347,22 +1347,27 @@ static void LoadIWadBase(void)
 {
     GameMode_t local_gamemode;
     GameMission_t local_gamemission;
-    D_GetModeAndMissionByIWADName(M_BaseName(wadfiles[0]), &local_gamemode, &local_gamemission);
+    D_GetModeAndMissionByIWADName(M_BaseName(wadfiles[0]), &local_gamemode,
+                                  &local_gamemission);
+
+    if (local_gamemission == none || local_gamemode == indetermined)
+    {
+        return;
+    }
 
     if (local_gamemission < pack_chex)
     {
         W_AddBaseDir("doom-all");
     }
-    else if (local_gamemission == pack_chex || local_gamemission == pack_chex3v)
+    if (local_gamemission == pack_chex || local_gamemission == pack_chex3v)
     {
         W_AddBaseDir("chex-all");
     }
     if (local_gamemission == doom)
     {
         W_AddBaseDir("doom1-all");
     }
-    else if (local_gamemission >= doom2
-             && local_gamemission <= pack_plut)
+    else if (local_gamemission >= doom2 && local_gamemission <= pack_plut)
     {
         W_AddBaseDir("doom2-all");
     }