[Scummvm-git-logs] scummvm master -> 835f9617820ae2737f293c65a917d40c95ae048c

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
835f961782 DIRECTOR: Improved file search in pathMakeRelative()


Commit: 835f9617820ae2737f293c65a917d40c95ae048c
    https://github.com/scummvm/scummvm/commit/835f9617820ae2737f293c65a917d40c95ae048c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-03-19T12:13:29+01:00

Commit Message:
DIRECTOR: Improved file search in pathMakeRelative()

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index ca701821c4e..6d32cebe0c0 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -394,6 +394,10 @@ Common::String getPath(Common::String path, Common::String cwd) {
 bool testPath(Common::String &path, bool directory) {
 	Common::FSNode d = Common::FSNode(*g_director->getGameDataDir());
 
+	// Test if we have it right in the SearchMan
+	if (SearchMan.hasFile(Common::Path(path, g_director->_dirSeparator)))
+		return true;
+
 	// check for the game data dir
 	if (!path.contains(g_director->_dirSeparator) && path.equalsIgnoreCase(d.getName())) {
 		if (!directory)