diff options
author | Johannes Schickel | 2012-07-29 16:19:00 -0700 |
---|---|---|
committer | Johannes Schickel | 2012-07-29 16:19:00 -0700 |
commit | e8fd51e56b9eb4eecd09711757b2d851d5bafafc (patch) | |
tree | e8724994bced092c6b08bf338b6f3d5515a24f75 /engines/touche | |
parent | 9a0ba7124fe6faee0d4c89ca10964df18740f105 (diff) | |
parent | 18fc453b97e4b67e5e4bd6522c8b8dd05d289910 (diff) | |
download | scummvm-rg350-e8fd51e56b9eb4eecd09711757b2d851d5bafafc.tar.gz scummvm-rg350-e8fd51e56b9eb4eecd09711757b2d851d5bafafc.tar.bz2 scummvm-rg350-e8fd51e56b9eb4eecd09711757b2d851d5bafafc.zip |
Merge pull request #252 from DrMcCoy/detector_public_reportUnknown
DETECTOR: Make reportUnknown() accessible to inherited AdvancedMetaEngine classes
Diffstat (limited to 'engines/touche')
-rw-r--r-- | engines/touche/detection.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 35dd54776f..e4bbe0c4c1 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -135,19 +135,13 @@ public: } virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { - const ADGameDescription *matchedDesc = detectGameFilebased(allFiles, Touche::fileBasedFallback); - - if (matchedDesc) { // We got a match - Common::String report = Common::String::format(_("Your game version has been detected using " - "filename matching as a variant of %s."), matchedDesc->gameid); - report += "\n"; - report += _("If this is an original and unmodified version, please report any"); - report += "\n"; - report += _("information previously printed by ScummVM to the team."); - report += "\n"; - g_system->logMessage(LogMessageType::kInfo, report.c_str()); - } + ADFilePropertiesMap filesProps; + + const ADGameDescription *matchedDesc = detectGameFilebased(allFiles, fslist, Touche::fileBasedFallback, &filesProps); + if (!matchedDesc) + return 0; + reportUnknown(fslist.begin()->getParent(), filesProps); return matchedDesc; } |