diff options
| author | Max Horn | 2011-06-14 18:02:09 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-14 18:52:11 +0200 |
| commit | 879c3c78177ee2ff95c0d22f82d3448877d6fa98 (patch) | |
| tree | 7a51efd1a5a77fbb89791b1a9a3ec2f5a87c1656 /engines/scumm | |
| parent | 64e523141fa619c1632dcb2b215cfd85c41ef5a1 (diff) | |
| download | scummvm-rg350-879c3c78177ee2ff95c0d22f82d3448877d6fa98.tar.gz scummvm-rg350-879c3c78177ee2ff95c0d22f82d3448877d6fa98.tar.bz2 scummvm-rg350-879c3c78177ee2ff95c0d22f82d3448877d6fa98.zip | |
DETECTOR: Pass allFiles to AdvancedMetaEngine::fallbackDetect()
Also reorder the parameters of composeFileHashMap, placing the "return value"
first.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/detection.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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) { |