aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2008-11-06 13:59:39 +0000
committerMax Horn2008-11-06 13:59:39 +0000
commit142a8d5a51c80d33175c94540ae5c487079d45e4 (patch)
tree038c57c6e52dcf3595c9b7d418c9d9ff018fa44b /common
parent252409d49c269a74108494b65c52ac0e67f287af (diff)
downloadscummvm-rg350-142a8d5a51c80d33175c94540ae5c487079d45e4.tar.gz
scummvm-rg350-142a8d5a51c80d33175c94540ae5c487079d45e4.tar.bz2
scummvm-rg350-142a8d5a51c80d33175c94540ae5c487079d45e4.zip
Simplified AdvancedMetaEngine::fallbackDetect usage
svn-id: r34909
Diffstat (limited to 'common')
-rw-r--r--common/advancedDetector.cpp4
-rw-r--r--common/advancedDetector.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp
index 71b83d0d62..96e0a37e0f 100644
--- a/common/advancedDetector.cpp
+++ b/common/advancedDetector.cpp
@@ -205,7 +205,7 @@ GameList AdvancedMetaEngine::detectGames(const FSList &fslist) const {
// Use fallback detector if there were no matches by other means
if (matches.empty()) {
- const Common::ADGameDescription *fallbackDesc = fallbackDetect(&fslist);
+ const Common::ADGameDescription *fallbackDesc = fallbackDetect(fslist);
if (fallbackDesc != 0) {
GameDescriptor desc(toGameDescriptor(*fallbackDesc, params.list));
updateGameDescriptor(desc, fallbackDesc, params);
@@ -268,7 +268,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
if (agdDesc == 0) {
// Use fallback detector if there were no matches by other means
- agdDesc = fallbackDetect(NULL);
+ agdDesc = fallbackDetect(files);
if (agdDesc != 0) {
// Seems we found a fallback match. But first perform a basic
// sanity check: the gameid must match.
diff --git a/common/advancedDetector.h b/common/advancedDetector.h
index d2a38d2835..522fd7b117 100644
--- a/common/advancedDetector.h
+++ b/common/advancedDetector.h
@@ -210,11 +210,8 @@ public:
* An (optional) generic fallback detect function which is invoked
* if both the regular MD5 based detection as well as the file
* based fallback failed to detect anything.
- *
- * @note The fslist parameter may be 0 -- in that case, it is assumed
- * that the callback searchs the current directory.
*/
- virtual const Common::ADGameDescription *fallbackDetect(const FSList *fslist) const {
+ virtual const Common::ADGameDescription *fallbackDetect(const FSList &fslist) const {
return 0;
}
};