OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- More options for the IWAD picker.

Browse source 
- Rearranged some options around a bit.
- Disable auto load is now an archived cvar.
This commit is contained in:
Rachael Alexanderson 2016-12-21 05:11:29 -05:00
commit cd3fc2d6b8
4 changed files with 53 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/d_main.cpp
View file

@ -205,7 +205,10 @@ CUSTOM_CVAR (String, vid_cursor, "None", CVAR_ARCHIVE | CVAR_NOINITCALL)
}
}
bool disableautoload = false; // [SP] No auto load
// Controlled by startup dialog
CVAR (Bool, disableautoload, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG)
CVAR (Bool, autoloadbrightmaps, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG)
CVAR (Bool, autoloadlights, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG)
bool wantToRestart;
bool DrawFSHUD; // [RH] Draw fullscreen HUD?
@ -2040,6 +2043,23 @@ static void AddAutoloadFiles(const char *autoname)
{
LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string
// [SP] Dialog reaction - load lights.pk3 and brightmaps.pk3 based on user choices
if (!(gameinfo.flags & GI_SHAREWARE))
{
if (autoloadlights)
{
const char *lightswad = BaseFileSearch ("lights.pk3", NULL);
if (lightswad)
D_AddFile (allwads, lightswad);
}
if (autoloadbrightmaps)
{
const char *bmwad = BaseFileSearch ("brightmaps.pk3", NULL);
if (bmwad)
D_AddFile (allwads, bmwad);
}
}
if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload") && !disableautoload)
{
FString file;