[Scummvm-git-logs] scummvm master -> d1dcfb9508e2ddeafd21de7160c87a016fa14af0

[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:
cce1cca608 DIRECTOR: Set depth of 5 for directory globs
d1dcfb9508 AD: Set scan depth when adding globs generated from the entries. Default is 5


Commit: cce1cca608bd7ae387b1c50da6a4accba9210c48
    https://github.com/scummvm/scummvm/commit/cce1cca608bd7ae387b1c50da6a4accba9210c48
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-02T18:23:55+01:00

Commit Message:
DIRECTOR: Set depth of 5 for directory globs

This fixes teamxtreme2 that has all game files sitting in DATA/ directory.

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index e445b0857d2..b63859700d0 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -103,7 +103,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 
 	for (uint i = 0; Director::directoryGlobs[i]; i++) {
 		Common::String directoryGlob = directoryGlobs[i];
-		SearchMan.addSubDirectoryMatching(_gameDataDir, directoryGlob);
+		SearchMan.addSubDirectoryMatching(_gameDataDir, directoryGlob, 0, 5);
 	}
 
 	if (debugChannelSet(-1, kDebug32bpp))


Commit: d1dcfb9508e2ddeafd21de7160c87a016fa14af0
    https://github.com/scummvm/scummvm/commit/d1dcfb9508e2ddeafd21de7160c87a016fa14af0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-02T18:23:55+01:00

Commit Message:
AD: Set scan depth when adding globs generated from the entries. Default is 5

Changed paths:
    engines/advancedDetector.cpp
    engines/advancedDetector.h


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 6f897eed8dd..18a602a71d6 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -461,7 +461,7 @@ Common::Error AdvancedMetaEngineDetection::createInstance(OSystem *syst, Engine
 			Common::FSNode gameDataDir = Common::FSNode(ConfMan.get("path"));
 
 			for (auto d = dirs.begin(); d != dirs.end(); ++d)
-				SearchMan.addSubDirectoryMatching(gameDataDir, *d);
+				SearchMan.addSubDirectoryMatching(gameDataDir, *d, 0, _fullPathGlobsDepth);
 		}
 
 		// Call child class's createInstanceMethod.
@@ -867,6 +867,7 @@ AdvancedMetaEngineDetection::AdvancedMetaEngineDetection(const void *descs, uint
 	_maxScanDepth = 1;
 	_directoryGlobs = NULL;
 	_maxAutogenLength = 15;
+	_fullPathGlobsDepth = 5;
 
 	_hashMapsInited = false;
 
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 1c0b7af8e50..7deb5a1a20f 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -352,6 +352,13 @@ protected:
 	 */
 	int _maxAutogenLength;
 
+	/**
+	 * If kADFlagMatchFullPaths is set, then use this value for specifying
+	 * depth for addSubDirectoryMatching() call
+	 * The default is 5;
+	 */
+	 int _fullPathGlobsDepth;
+
 public:
 	/**
 	 * Initialize game detection using AdvancedMetaEngineDetection.