mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-22 11:22:18 -04:00
don't autoload from doom-all for unknown IWADs (#2208)
This commit is contained in:
parent
e3d74f9e5e
commit
926c90b2cb
@ -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,
|
||||
|
13
src/d_main.c
13
src/d_main.c
@ -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");
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user