OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved iwadinfo.txt to zd_extra.pk3.

Browse source 
This was done for two reasons:

1. It forces loading of zd_extra.pk3 for the stock IWADs, eliminating a certain kind of user error.
2. It removes the stock IWAD definitions for custom games that distribute the engine along with their data, so that it doesn't pick up on Steam and GOG installations and shows an inappropriate IWAD picker.
This commit is contained in:
Christoph Oelckers 2019-07-16 20:22:15 +02:00
commit 38a1a05af3
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.cpp
View file

@ -2338,7 +2338,7 @@ void D_DoomMain (void)
FString optionalwad = BaseFileSearch(OPTIONALWAD, NULL, true);
iwad_man = new FIWadManager(basewad);
iwad_man = new FIWadManager(basewad, optionalwad);
// Now that we have the IWADINFO, initialize the autoload ini sections.
GameConfig->DoAutoloadSetup(iwad_man);
@ -2368,7 +2368,7 @@ void D_DoomMain (void)
if (iwad_man == NULL)
{
iwad_man = new FIWadManager(basewad);
iwad_man = new FIWadManager(basewad, optionalwad);
}
const FIWADInfo *iwad_info = iwad_man->FindIWAD(allwads, iwad, basewad, optionalwad);
gameinfo.gametype = iwad_info->gametype;