mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-22 20:21:26 +00:00
Added ability to load any IWAD without extension
Previously, only .wad files can specified without file extension for -iwad command line option For example, -iwad square1 will load square1.pk3 as IWAD
This commit is contained in:
parent
17bc9c3f69
commit
ca0e39cd0c
1 changed files with 27 additions and 16 deletions
|
@ -519,28 +519,39 @@ int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad,
|
|||
|
||||
if (iwadparm)
|
||||
{
|
||||
// Check if the given IWAD has an absolute path, in which case the search path will be ignored.
|
||||
custwad = iwadparm;
|
||||
FixPathSeperator(custwad);
|
||||
DefaultExtension(custwad, ".wad");
|
||||
bool isAbsolute = (custwad[0] == '/');
|
||||
const char* const extensions[] = { ".wad", ".pk3", ".iwad", ".ipk3", ".ipk7" };
|
||||
|
||||
for (auto ext : extensions)
|
||||
{
|
||||
// Check if the given IWAD has an absolute path, in which case the search path will be ignored.
|
||||
custwad = iwadparm;
|
||||
FixPathSeperator(custwad);
|
||||
DefaultExtension(custwad, ext);
|
||||
bool isAbsolute = (custwad[0] == '/');
|
||||
#ifdef WINDOWS
|
||||
isAbsolute |= (custwad.Len() >= 2 && custwad[1] == ':');
|
||||
isAbsolute |= (custwad.Len() >= 2 && custwad[1] == ':');
|
||||
#endif
|
||||
if (isAbsolute)
|
||||
{
|
||||
if (FileExists(custwad)) mFoundWads.Push({ custwad, "", -1 });
|
||||
}
|
||||
else
|
||||
{
|
||||
for (auto &dir : mSearchPaths)
|
||||
if (isAbsolute)
|
||||
{
|
||||
FStringf fullpath("%s/%s", dir.GetChars(), custwad.GetChars());
|
||||
if (FileExists(fullpath))
|
||||
if (FileExists(custwad)) mFoundWads.Push({ custwad, "", -1 });
|
||||
}
|
||||
else
|
||||
{
|
||||
for (auto &dir : mSearchPaths)
|
||||
{
|
||||
mFoundWads.Push({ fullpath, "", -1 });
|
||||
FStringf fullpath("%s/%s", dir.GetChars(), custwad.GetChars());
|
||||
if (FileExists(fullpath))
|
||||
{
|
||||
mFoundWads.Push({ fullpath, "", -1 });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (mFoundWads.Size() != numFoundWads)
|
||||
{
|
||||
// Found IWAD with guessed extension
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// -iwad not found or not specified. Revert back to standard behavior.
|
||||
|
|
Loading…
Reference in a new issue