zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allows loading directories as IWADs using "-iwad" command line parameter.

Browse source
This commit is contained in:
MaxED 2016-10-24 14:13:40 +03:00 committed by Christoph Oelckers
parent 623910bd2a
commit 81449728d7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_iwad.cpp
View file

@ -292,6 +292,7 @@ void FIWadManager::ParseIWadInfos(const char *fn)
int FIWadManager::ScanIWAD (const char *iwad) int FIWadManager::ScanIWAD (const char *iwad)
{ {
FResourceFile *iwadfile = FResourceFile::OpenResourceFile(iwad, NULL, true); FResourceFile *iwadfile = FResourceFile::OpenResourceFile(iwad, NULL, true);
if (iwadfile == NULL) iwadfile = FResourceFile::OpenDirectory(iwad, true); //mxd. A directory can also work as an IWAD
if (iwadfile != NULL) if (iwadfile != NULL)
{ {
@ -344,7 +345,7 @@ int FIWadManager::CheckIWAD (const char *doomwaddir, WadStuff *wads)
iwad.Format ("%s%s%s", doomwaddir, slash, mIWadNames[i].GetChars()); iwad.Format ("%s%s%s", doomwaddir, slash, mIWadNames[i].GetChars());
FixPathSeperator (iwad); FixPathSeperator (iwad);
if (FileExists (iwad)) if (DirEntryExists(iwad))
{ {
wads[i].Type = ScanIWAD (iwad); wads[i].Type = ScanIWAD (iwad);
if (wads[i].Type != -1) if (wads[i].Type != -1)
@ -413,7 +414,7 @@ int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad,
} }
else else
{ {
DefaultExtension (custwad, ".wad"); if(FileExists(custwad)) DefaultExtension (custwad, ".wad"); //mxd. Don't treat folders as .wads
iwadparm = custwad; iwadparm = custwad;
mIWadNames[0] = custwad; mIWadNames[0] = custwad;
CheckIWAD ("", &wads[0]); CheckIWAD ("", &wads[0]);