zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-15 08:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- second part of last commit. This file was accidentally unselected.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-08 14:35:36 +01:00
parent 1815b076ee
commit 9d877f75e3
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/d_iwad.cpp
View file

@ -381,13 +381,15 @@ int FIWadManager::CheckIWAD (const char *doomwaddir, WadStuff *wads)
// //
//========================================================================== //==========================================================================
static bool havepicked = false;
int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad, const char *zdoom_wad) int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad, const char *zdoom_wad)
{ {
TArray<WadStuff> wads; TArray<WadStuff> wads;
TArray<size_t> foundwads; TArray<size_t> foundwads;
const char *iwadparm = Args->CheckValue ("-iwad"); const char *iwadparm = Args->CheckValue ("-iwad");
size_t numwads;
int pickwad; int pickwad;
size_t numwads;
size_t i; size_t i;
bool iwadparmfound = false; bool iwadparmfound = false;
FString custwad; FString custwad;
@ -536,25 +538,28 @@ int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad,
{ {
for (i = 0; i < numwads; ++i) for (i = 0; i < numwads; ++i)
{ {
FString basename = ExtractFileBase (wads[i].Path); FString basename = ExtractFileBase(wads[i].Path);
if (stricmp (basename, defaultiwad) == 0) if (stricmp(basename, defaultiwad) == 0)
{ {
defiwad = (int)i; defiwad = (int)i;
break; break;
} }
} }
} }
pickwad = I_PickIWad (&wads[0], (int)numwads, queryiwad, defiwad); if (!havepicked) // just use the first IWAD if the restart doesn't have a -iwad parameter. We cannot open the picker in fullscreen mode.
{
pickwad = I_PickIWad(&wads[0], (int)numwads, queryiwad, defiwad);
if (pickwad >= 0) if (pickwad >= 0)
{ {
// The newly selected IWAD becomes the new default // The newly selected IWAD becomes the new default
FString basename = ExtractFileBase (wads[pickwad].Path); FString basename = ExtractFileBase(wads[pickwad].Path);
defaultiwad = basename; defaultiwad = basename;
} }
}
if (pickwad < 0) if (pickwad < 0)
exit (0); exit(0);
havepicked = true;
}
}
// zdoom.pk3 must always be the first file loaded and the IWAD second. // zdoom.pk3 must always be the first file loaded and the IWAD second.
wadfiles.Clear(); wadfiles.Clear();