OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Handle Extra Args

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2024-04-21 12:20:36 -03:00 • committed by Rachael Alexanderson
commit c3ac4c9c38
11 changed files with 136 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/d_main.cpp
View file

@ -1809,7 +1809,9 @@ static void GetCmdLineFiles(std::vector<std::string>& wadfiles)
int i, argc;
argc = Args->CheckParmList("-file", &args);
for (i = 0; i < argc; ++i)
// [RL0] Check for array size to only add new wads
for (i = wadfiles.size(); i < argc; ++i)
{
D_AddWildFile(wadfiles, args[i].GetChars(), ".wad", GameConfig);
}
@ -3764,6 +3766,9 @@ static int D_DoomMain_Internal (void)
std::vector<std::string> allwads;
const FIWADInfo *iwad_info = iwad_man->FindIWAD(allwads, iwad.GetChars(), basewad.GetChars(), optionalwad.GetChars());
GetCmdLineFiles(pwads); // [RL0] Update with files passed on the launcher extra args
if (!iwad_info) return 0; // user exited the selection popup via cancel button.
if ((iwad_info->flags & GI_SHAREWARE) && pwads.size() > 0)
{