zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed setup of files to load on startup. 

Order of addition was not correct and one function had a bad parameter type.
This commit is contained in:
Christoph Oelckers 2022-04-30 23:26:51 +02:00
parent 0a208597c6
commit 2235b42993
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/d_main.cpp
View File

@ -1941,7 +1941,7 @@ static void D_DoomInit()
// //
//========================================================================== //==========================================================================
static void AddAutoloadFiles(const char *autoname, TArray<FString> allwads) static void AddAutoloadFiles(const char *autoname, TArray<FString>& allwads)
{ {
LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string
@ -2976,7 +2976,7 @@ static FILE* D_GetHashFile()
// //
//========================================================================== //==========================================================================
static int D_InitGame(const FIWADInfo* iwad_info, TArray<FString> allwads) static int D_InitGame(const FIWADInfo* iwad_info, TArray<FString>& allwads, TArray<FString>& pwads)
{ {
gameinfo.gametype = iwad_info->gametype; gameinfo.gametype = iwad_info->gametype;
gameinfo.flags = iwad_info->flags; gameinfo.flags = iwad_info->flags;
@ -3054,6 +3054,7 @@ static int D_InitGame(const FIWADInfo* iwad_info, TArray<FString> allwads)
FixMacHexen(fileSystem); FixMacHexen(fileSystem);
FindStrifeTeaserVoices(fileSystem); FindStrifeTeaserVoices(fileSystem);
}; };
allwads.Append(std::move(pwads));
bool allowduplicates = Args->CheckParm("-allowduplicates"); bool allowduplicates = Args->CheckParm("-allowduplicates");
auto hashfile = D_GetHashFile(); auto hashfile = D_GetHashFile();
@ -3568,10 +3569,9 @@ static int D_DoomMain_Internal (void)
{ {
I_FatalError ("You cannot -file with the shareware version. Register!"); I_FatalError ("You cannot -file with the shareware version. Register!");
} }
allwads.Append(std::move(pwads));
lastIWAD = iwad; lastIWAD = iwad;
int ret = D_InitGame(iwad_info, allwads); int ret = D_InitGame(iwad_info, allwads, pwads);
allwads.Reset(); allwads.Reset();
delete iwad_man; // now we won't need this anymore delete iwad_man; // now we won't need this anymore
iwad_man = NULL; iwad_man = NULL;