From 879c3c78177ee2ff95c0d22f82d3448877d6fa98 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 14 Jun 2011 18:02:09 +0200
Subject: DETECTOR: Pass allFiles to AdvancedMetaEngine::fallbackDetect()

Also reorder the parameters of composeFileHashMap, placing the "return value"
first.
---
 engines/scumm/detection.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/scumm/detection.cpp')

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 4b673ad8ff..e5c5906404 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -431,7 +431,7 @@ static void computeGameSettingsFromMD5(const Common::FSList &fslist, const GameF
 	}
 }
 
-static void composeFileHashMap(const Common::FSList &fslist, DescMap &fileMD5Map, int depth, const char **globs) {
+static void composeFileHashMap(DescMap &fileMD5Map, const Common::FSList &fslist, int depth, const char **globs) {
 	if (depth <= 0)
 		return;
 
@@ -459,9 +459,8 @@ static void composeFileHashMap(const Common::FSList &fslist, DescMap &fileMD5Map
 				continue;
 
 			Common::FSList files;
-
 			if (file->getChildren(files, Common::FSNode::kListAll)) {
-				composeFileHashMap(files, fileMD5Map, depth - 1, globs);
+				composeFileHashMap(fileMD5Map, files, depth - 1, globs);
 			}
 		}
 	}
@@ -472,7 +471,7 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul
 	DetectorResult dr;
 
 	// Dive one level down since mac indy3/loom has its files split into directories. See Bug #1438631
-	composeFileHashMap(fslist, fileMD5Map, 2, directoryGlobs);
+	composeFileHashMap(fileMD5Map, fslist, 2, directoryGlobs);
 
 	// Iterate over all filename patterns.
 	for (const GameFilenamePattern *gfp = gameFilenamesTable; gfp->gameid; ++gfp) {
-- 
cgit v1.2.3