mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-12-18 00:22:11 +00:00
- fixed: The 'load' command in GAMEINFO only worked if the filename contained a slash.
This commit is contained in:
parent
efa9e0c3ee
commit
4e53df8bca
1 changed files with 14 additions and 10 deletions
|
@ -1807,11 +1807,16 @@ static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char
|
|||
// Try looking for the wad in the same directory as the .wad
|
||||
// before looking for it in the current directory.
|
||||
|
||||
FString checkpath;
|
||||
if (lastSlash != NULL)
|
||||
{
|
||||
FString checkpath(fn, (lastSlash - fn) + 1);
|
||||
checkpath = FString(fn, (lastSlash - fn) + 1);
|
||||
checkpath += sc.String;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
checkpath = sc.String;
|
||||
}
|
||||
if (!FileExists(checkpath))
|
||||
{
|
||||
pos += D_AddFile(pwads, sc.String, true, pos);
|
||||
|
@ -1821,7 +1826,6 @@ static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char
|
|||
pos += D_AddFile(pwads, checkpath, true, pos);
|
||||
}
|
||||
}
|
||||
}
|
||||
while (sc.CheckToken(','));
|
||||
}
|
||||
else if (!nextKey.CompareNoCase("NOSPRITERENAME"))
|
||||
|
|
Loading…
Reference in a new issue