diff options
author | Gregory Montoir | 2007-03-08 21:33:55 +0000 |
---|---|---|
committer | Gregory Montoir | 2007-03-08 21:33:55 +0000 |
commit | ee664dc62de708b2f005adcaa48c8f9cbddfb57e (patch) | |
tree | b7db974ddabb604ef0dfce6f7b0e25501ef82a7a /common/advancedDetector.cpp | |
parent | c09f86fb6a5d2083824b651e132f25163a6bc7e3 (diff) | |
download | scummvm-rg350-ee664dc62de708b2f005adcaa48c8f9cbddfb57e.tar.gz scummvm-rg350-ee664dc62de708b2f005adcaa48c8f9cbddfb57e.tar.bz2 scummvm-rg350-ee664dc62de708b2f005adcaa48c8f9cbddfb57e.zip |
added a flag to enable/disable printing a warning when filename based detection find a match, also updated some comments.
svn-id: r26029
Diffstat (limited to 'common/advancedDetector.cpp')
-rw-r--r-- | common/advancedDetector.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp index 5f2873126a..937f764ccb 100644 --- a/common/advancedDetector.cpp +++ b/common/advancedDetector.cpp @@ -417,13 +417,6 @@ static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &p } if (params.fileBasedFallback != 0) { - // The format of fileBasedFallback is like this: - // It points to an array of strings (char pointers), separated into - // multiple "rows". - // First comes a gameid, then follows a list of filenames that have - // to be present in order to generate a match; the row is terminated - // by a zero byte. - // The whole list is terminated by another zero byte (i.e. a zero gameid). const ADFileBasedFallback *ptr = params.fileBasedFallback; const char* const* filenames = 0; @@ -448,6 +441,9 @@ static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &p } } + // Then we perform the actual filename matching. If there are + // several matches, only the one with the maximum numbers of + // files is considered. int maxNumMatchedFiles = 0; const ADGameDescription *matchedDesc = 0; @@ -490,11 +486,13 @@ static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &p } if (matchedDesc) { // We got a match - // FIXME: This warning, if ever seen by somebody, is - // extremly cryptic! - warning("But it looks like unknown variant of %s", matchedDesc->gameid); - matched.push_back(matchedDesc); + if (params.flags & kADFlagPrintWarningOnFileBasedFallback) { + printf("Your game version has been detected using filename matching as a\n"); + printf("variant of %s.\n", matchedDesc->gameid); + printf("If this is an original and unmodified version, please report any\n"); + printf("information previously printed by ScummVM to the team.\n"); + } } } |