[Scummvm-git-logs] scummvm master -> 747331874f9574f12453bf8438edb1fb30c943b2

[sev-]

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

Summary:
80b3d8becd AD: Transparently add path directories when kADFlagMatchFullPaths is set
747331874f DIRECTOR: Remove code that adds directoy paths from detection table


Commit: 80b3d8becdff95af91b973acb8f4518546a92920
    https://github.com/scummvm/scummvm/commit/80b3d8becdff95af91b973acb8f4518546a92920
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-03T23:39:47+01:00

Commit Message:
AD: Transparently add path directories when kADFlagMatchFullPaths is set

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index b936d61973d..b5963597fe7 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -455,6 +455,14 @@ Common::Error AdvancedMetaEngineDetection::createInstance(OSystem *syst, Engine
 	}
 
 	if (plugin) {
+		if (_flags & kADFlagMatchFullPaths) {
+			Common::StringArray dirs = getPathsFromEntry(agdDesc.desc);
+			Common::FSNode gameDataDir = Common::FSNode(ConfMan.get("path"));
+
+			for (auto d = dirs.begin(); d != dirs.end(); ++d)
+				SearchMan.addSubDirectoryMatching(gameDataDir, *d);
+		}
+
 		// Call child class's createInstanceMethod.
 		return plugin->get<AdvancedMetaEngine>().createInstance(syst, engine, agdDesc.desc);
 	}


Commit: 747331874f9574f12453bf8438edb1fb30c943b2
    https://github.com/scummvm/scummvm/commit/747331874f9574f12453bf8438edb1fb30c943b2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-03T23:39:47+01:00

Commit Message:
DIRECTOR: Remove code that adds directoy paths from detection table

AdvancedDetector is doing it for us automagically

Changed paths:
    engines/director/metaengine.cpp


diff --git a/engines/director/metaengine.cpp b/engines/director/metaengine.cpp
index 6a888285d8a..495131aaecd 100644
--- a/engines/director/metaengine.cpp
+++ b/engines/director/metaengine.cpp
@@ -72,12 +72,6 @@ public:
 };
 
 Common::Error DirectorMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
-	Common::StringArray dirs = AdvancedMetaEngineDetection::getPathsFromEntry(desc);
-	Common::FSNode gameDataDir = Common::FSNode(ConfMan.get("path"));
-
-	for (auto dir = dirs.begin(); dir != dirs.end(); ++dir)
-		SearchMan.addSubDirectoryMatching(gameDataDir, *dir);
-
 	*engine = new Director::DirectorEngine(syst, (const Director::DirectorGameDescription *)desc);
 	return Common::kNoError;
 }