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

This commit is contained in:
Roman Fomin 2025-02-19 12:47:22 +07:00 committed by GitHub
parent e3d74f9e5e
commit 926c90b2cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions

View File

@ -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,

View File

@ -1347,13 +1347,19 @@ 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");
}
@ -1361,8 +1367,7 @@ static void LoadIWadBase(void)
{
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");
}