OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- don't call BaseFileSearch inside of d_iwad.cpp since it is supposed to be treated as a private function.

Browse source
This commit is contained in:
Rachael Alexanderson 2017-09-09 06:36:20 -04:00
commit bcc5830467
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.cpp
View file

@ -2352,6 +2352,8 @@ void D_DoomMain (void)
}
FString basewad = wad;
FString optionalwad = BaseFileSearch(OPTIONALWAD, NULL, true);
iwad_man = new FIWadManager(basewad);
// Now that we have the IWADINFO, initialize the autoload ini sections.
@ -2384,7 +2386,7 @@ void D_DoomMain (void)
{
iwad_man = new FIWadManager(basewad);
}
const FIWADInfo *iwad_info = iwad_man->FindIWAD(allwads, iwad, basewad);
const FIWADInfo *iwad_info = iwad_man->FindIWAD(allwads, iwad, basewad, optionalwad);
gameinfo.gametype = iwad_info->gametype;
gameinfo.flags = iwad_info->flags;
gameinfo.ConfigName = iwad_info->Configname;