mirror of
https://github.com/ZDoom/gzdoom.git
synced 2025-04-12 05:01:45 +00:00
- don't load idres24.wad in multiplayer games by default; allow override with cvar setting
This commit is contained in:
parent
538f62a556
commit
e5cf79fecb
1 changed files with 10 additions and 3 deletions
|
@ -59,6 +59,8 @@ EXTERN_CVAR(Bool, autoloadbrightmaps)
|
|||
EXTERN_CVAR(Bool, autoloadwidescreen)
|
||||
EXTERN_CVAR(String, language)
|
||||
|
||||
CVAR(Int, i_loadsupportwad, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) // 0=never, 1=singleplayer only, 2=always
|
||||
|
||||
bool foundprio = false; // global to prevent iwad box from appearing
|
||||
|
||||
//==========================================================================
|
||||
|
@ -842,11 +844,16 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
|
|||
|
||||
if(info.SupportWAD.IsNotEmpty())
|
||||
{
|
||||
FString supportWAD = IWADPathFileSearch(info.SupportWAD);
|
||||
bool wantsnetgame = (Args->CheckParm("-join") || Args->CheckParm("-host"));
|
||||
|
||||
if(supportWAD.IsNotEmpty())
|
||||
if ((wantsnetgame && i_loadsupportwad == 1) || (i_loadsupportwad == 2))
|
||||
{
|
||||
D_AddFile(wadfiles, supportWAD.GetChars(), true, -1, GameConfig);
|
||||
FString supportWAD = IWADPathFileSearch(info.SupportWAD);
|
||||
|
||||
if(supportWAD.IsNotEmpty())
|
||||
{
|
||||
D_AddFile(wadfiles, supportWAD.GetChars(), true, -1, GameConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue