libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 09:56:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DIRECTOR: Probe additional variant in makePathRelative()

Browse Source
This commit is contained in:
Eugene Sandulenko 2022-03-17 00:38:34 +01:00
parent 9c09c68cd6
commit 1a5f2d6af9
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/director/util.cpp
View File

@ -492,8 +492,15 @@ Common::String wrappedPathMakeRelative(Common::String path, bool recursive, bool
debug(9, "pathMakeRelative(): s3 try %s", convPath.c_str());
if (!testPath(convPath, directory))
continue;
if (!testPath(convPath, directory)) {
// If we were supplied with parh with subdirectories,
// attempt to combine it with the current movie path at every iteration
Common::String locPath = Common::normalizePath(g_director->getCurrentPath() + convPath, g_director->_dirSeparator);
debug(9, "pathMakeRelative(): s3.1 try %s", locPath.c_str());
if (!testPath(locPath, directory))
continue;
}
debug(9, "pathMakeRelative(): s3 converted %s -> %s", path.c_str(), convPath.c_str());