diff options
| author | Max Horn | 2011-06-11 17:52:32 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-14 18:17:01 +0200 |
| commit | 7c992d6598743fce09e6666f2c9a0f550ac5e870 (patch) | |
| tree | 640b10d5e91119f6b943669f703e1fe0bbbb261a /engines/tinsel | |
| parent | e4a4aa30f743395342a4ce9cbd6bf6f3f81d6172 (diff) | |
| download | scummvm-rg350-7c992d6598743fce09e6666f2c9a0f550ac5e870.tar.gz scummvm-rg350-7c992d6598743fce09e6666f2c9a0f550ac5e870.tar.bz2 scummvm-rg350-7c992d6598743fce09e6666f2c9a0f550ac5e870.zip | |
DETECTOR: Merge ADParams into AdvancedMetaEngine
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/detection.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 59a567bc63..6a221da0eb 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -77,7 +77,7 @@ static const PlainGameDescriptor tinselGames[] = { class TinselMetaEngine : public AdvancedMetaEngine { public: TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) { - params.singleid = "tinsel"; + _singleid = "tinsel"; } virtual const char *getName() const { @@ -242,7 +242,7 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList & if (testFile.open(allFiles[fname])) { tmp.size = (int32)testFile.size(); - tmp.md5 = computeStreamMD5AsString(testFile, params.md5Bytes); + tmp.md5 = computeStreamMD5AsString(testFile, _md5Bytes); } else { tmp.size = -1; } @@ -262,11 +262,6 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList & bool fileMissing = false; - if ((params.flags & kADFlagUseExtraAsHint) && !extra.empty() && g->desc.extra != extra) - continue; - - bool allFilesPresent = true; - // Try to match all files for this game for (fileDesc = g->desc.filesDescriptions; fileDesc->fileName; fileDesc++) { // Get the next filename, stripping off any '1' suffix character @@ -284,7 +279,6 @@ const ADGameDescription *TinselMetaEngine::fallbackDetect(const Common::FSList & if (!filesSizeMD5.contains(tstr)) { fileMissing = true; - allFilesPresent = false; break; } |