[Scummvm-cvs-logs] scummvm master -> ac070ae0c06cdb15fb8ab19b5eff1ba39a527412

[fuzzie]

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:
7840b5e4b9 COMMON: Add depth/flat parameters to addSubDirectoryMatching.
ac070ae0c0 MOHAWK: Use addSubDirectoryMatching for LB paths.


Commit: 7840b5e4b9e83270b8df5d8f57f292672163bfe5
    https://github.com/scummvm/scummvm/commit/7840b5e4b9e83270b8df5d8f57f292672163bfe5
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2013-06-06T12:41:14-07:00

Commit Message:
COMMON: Add depth/flat parameters to addSubDirectoryMatching.

Changed paths:
    common/archive.cpp
    common/archive.h



diff --git a/common/archive.cpp b/common/archive.cpp
index 1323f14..57ebeb2 100644
--- a/common/archive.cpp
+++ b/common/archive.cpp
@@ -118,7 +118,7 @@ void SearchSet::addDirectory(const String &name, const FSNode &dir, int priority
 	add(name, new FSDirectory(dir, depth, flat), priority);
 }
 
-void SearchSet::addSubDirectoriesMatching(const FSNode &directory, String origPattern, bool ignoreCase, int priority) {
+void SearchSet::addSubDirectoriesMatching(const FSNode &directory, String origPattern, bool ignoreCase, int priority, int depth, bool flat) {
 	FSList subDirs;
 	if (!directory.getChildren(subDirs))
 		return;
@@ -161,9 +161,9 @@ void SearchSet::addSubDirectoriesMatching(const FSNode &directory, String origPa
 			}
 
 			if (nextPattern.empty())
-				addDirectory(name, *i, priority);
+				addDirectory(name, *i, priority, depth, flat);
 			else
-				addSubDirectoriesMatching(*i, nextPattern, ignoreCase, priority);
+				addSubDirectoriesMatching(*i, nextPattern, ignoreCase, priority, depth, flat);
 		}
 	}
 }
diff --git a/common/archive.h b/common/archive.h
index ffd86d7..2f9736f 100644
--- a/common/archive.h
+++ b/common/archive.h
@@ -184,8 +184,8 @@ public:
 	 * to assume that this method is using anything other than a simple case insensitive compare.
 	 * Thus do not use any tokens like '*' or '?' in the "caselessName" parameter of this function!
 	 */
-	void addSubDirectoryMatching(const FSNode &directory, const String &caselessName, int priority = 0) {
-		addSubDirectoriesMatching(directory, caselessName, true, priority);
+	void addSubDirectoryMatching(const FSNode &directory, const String &caselessName, int priority = 0, int depth = 1, bool flat = false) {
+		addSubDirectoriesMatching(directory, caselessName, true, priority, depth, flat);
 	}
 
 	/**
@@ -208,7 +208,7 @@ public:
 	 *
 	 * @see Common::matchString
 	 */
-	void addSubDirectoriesMatching(const FSNode &directory, String origPattern, bool ignoreCase, int priority = 0);
+	void addSubDirectoriesMatching(const FSNode &directory, String origPattern, bool ignoreCase, int priority = 0, int depth = 1, bool flat = false);
 
 	/**
 	 * Remove an archive from the searchable set.


Commit: ac070ae0c06cdb15fb8ab19b5eff1ba39a527412
    https://github.com/scummvm/scummvm/commit/ac070ae0c06cdb15fb8ab19b5eff1ba39a527412
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2013-06-06T12:41:47-07:00

Commit Message:
MOHAWK: Use addSubDirectoryMatching for LB paths.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index f80dbfa..efa0dd3 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -148,16 +148,10 @@ MohawkEngine_LivingBooks::MohawkEngine_LivingBooks(OSystem *syst, const MohawkGa
 
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
 	// Rugrats
-	const Common::FSNode ProgPath = gameDataDir.getChild("program");
-	if (ProgPath.exists())
-		SearchMan.addDirectory(ProgPath.getPath(), ProgPath, 0, 2);
-	const Common::FSNode RugPath = gameDataDir.getChild("Rugrats Adventure Game");
-	if (RugPath.exists())
-		SearchMan.addDirectory(RugPath.getPath(), RugPath, 0, 2);
+	SearchMan.addSubDirectoryMatching(gameDataDir, "program", 0, 2);
+	SearchMan.addSubDirectoryMatching(gameDataDir, "Rugrats Adventure Game", 0, 2);
 	// CarmenTQ
-	const Common::FSNode CTQPath = gameDataDir.getChild("95instal");
-	if (CTQPath.exists())
-		SearchMan.addDirectory(CTQPath.getPath(), CTQPath, 0, 4);
+	SearchMan.addSubDirectoryMatching(gameDataDir, "95instal", 0, 4);
 }
 
 MohawkEngine_LivingBooks::~MohawkEngine_LivingBooks() {