aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/detection.cpp
diff options
context:
space:
mode:
authorMax Horn2011-06-14 18:02:09 +0200
committerMax Horn2011-06-14 18:52:11 +0200
commit879c3c78177ee2ff95c0d22f82d3448877d6fa98 (patch)
tree7a51efd1a5a77fbb89791b1a9a3ec2f5a87c1656 /engines/sci/detection.cpp
parent64e523141fa619c1632dcb2b215cfd85c41ef5a1 (diff)
downloadscummvm-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/sci/detection.cpp')
-rw-r--r--engines/sci/detection.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 8d53ce9937..7bc9699e9b 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -390,7 +390,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
- const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const;
+ const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const;
virtual bool hasFeature(MetaEngineFeature f) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
@@ -418,7 +418,7 @@ Common::Language charToScummVMLanguage(const char c) {
}
}
-const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fslist) const {
+const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
bool foundResMap = false;
bool foundRes000 = false;
@@ -430,6 +430,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl
s_fallbackDesc.gameid = "sci";
// First grab all filenames
+ // TODO: Consider using allFiles instead of fslist
for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
if (file->isDirectory())
continue;