zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: zd_extra.pk3 now loads before the iwad.

Browse source
This commit is contained in:
Rachael Alexanderson 2017-09-09 06:21:40 -04:00
parent 6044c46d39
commit 9a7f727aa4
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/d_iwad.cpp
View file

@ -51,6 +51,8 @@
#include "doomerrors.h" #include "doomerrors.h"
#include "v_text.h" #include "v_text.h"
// external function declarations
const char *BaseFileSearch (const char *file, const char *ext, bool lookfirstinprogdir=false);
CVAR (Bool, queryiwad, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR (Bool, queryiwad, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CVAR (String, defaultiwad, "", CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR (String, defaultiwad, "", CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
@ -688,6 +690,11 @@ int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad,
wadfiles.Clear(); wadfiles.Clear();
D_AddFile (wadfiles, zdoom_wad); D_AddFile (wadfiles, zdoom_wad);
// [SP] Load non-free assets if available. This must be done before the IWAD.
const char *optionalassets = BaseFileSearch(OPTIONALWAD, NULL, true);
if (optionalassets)
D_AddFile(wadfiles, optionalassets);
if (picks[pick].mRequiredPath.IsNotEmpty()) if (picks[pick].mRequiredPath.IsNotEmpty())
{ {
D_AddFile (wadfiles, picks[pick].mRequiredPath); D_AddFile (wadfiles, picks[pick].mRequiredPath);

5
src/d_main.cpp
View file

@ -2087,11 +2087,6 @@ static void AddAutoloadFiles(const char *autoname)
{ {
LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string
// [SP] Load non-free assets if available.
const char *optionalassets = BaseFileSearch(OPTIONALWAD, NULL);
if (optionalassets)
D_AddFile(allwads, optionalassets);
// [SP] Dialog reaction - load lights.pk3 and brightmaps.pk3 based on user choices // [SP] Dialog reaction - load lights.pk3 and brightmaps.pk3 based on user choices
if (!(gameinfo.flags & GI_SHAREWARE)) if (!(gameinfo.flags & GI_SHAREWARE))
{ {