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

- fixed: The 'load' command in GAMEINFO only worked if the filename contained a slash.

Browse source
This commit is contained in:
Christoph Oelckers 2014-01-26 14:32:44 +01:00
parent efa9e0c3ee
commit 4e53df8bca
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/d_main.cpp
View file

@ -1807,19 +1807,23 @@ static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char
// Try looking for the wad in the same directory as the .wad // Try looking for the wad in the same directory as the .wad
// before looking for it in the current directory. // before looking for it in the current directory.
FString checkpath;
if (lastSlash != NULL) if (lastSlash != NULL)
{ {
FString checkpath(fn, (lastSlash - fn) + 1); checkpath = FString(fn, (lastSlash - fn) + 1);
checkpath += sc.String; checkpath += sc.String;
}
if (!FileExists (checkpath)) else
{ {
pos += D_AddFile(pwads, sc.String, true, pos); checkpath = sc.String;
} }
else if (!FileExists(checkpath))
{ {
pos += D_AddFile(pwads, checkpath, true, pos); pos += D_AddFile(pwads, sc.String, true, pos);
} }
else
{
pos += D_AddFile(pwads, checkpath, true, pos);
} }
} }
while (sc.CheckToken(',')); while (sc.CheckToken(','));