From 2235b42993c5217b7b507efee55b15668ffd159d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 30 Apr 2022 23:26:51 +0200 Subject: [PATCH] - fixed setup of files to load on startup. Order of addition was not correct and one function had a bad parameter type. --- src/d_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 516ac2b1f..9d2f1f0cb 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -1941,7 +1941,7 @@ static void D_DoomInit() // //========================================================================== -static void AddAutoloadFiles(const char *autoname, TArray allwads) +static void AddAutoloadFiles(const char *autoname, TArray& allwads) { 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 allwads) +static int D_InitGame(const FIWADInfo* iwad_info, TArray& allwads, TArray& pwads) { gameinfo.gametype = iwad_info->gametype; gameinfo.flags = iwad_info->flags; @@ -3054,6 +3054,7 @@ static int D_InitGame(const FIWADInfo* iwad_info, TArray allwads) FixMacHexen(fileSystem); FindStrifeTeaserVoices(fileSystem); }; + allwads.Append(std::move(pwads)); bool allowduplicates = Args->CheckParm("-allowduplicates"); auto hashfile = D_GetHashFile(); @@ -3568,10 +3569,9 @@ static int D_DoomMain_Internal (void) { I_FatalError ("You cannot -file with the shareware version. Register!"); } - allwads.Append(std::move(pwads)); lastIWAD = iwad; - int ret = D_InitGame(iwad_info, allwads); + int ret = D_InitGame(iwad_info, allwads, pwads); allwads.Reset(); delete iwad_man; // now we won't need this anymore iwad_man = NULL;