Merge remote branch 'upstream/master' into pegasus

1 files changed, 8 insertions, 4 deletions

diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 8ddfcd4fed..810a37720a 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -120,11 +120,15 @@ static const char * const directoryGlobs[] = {
 class ToonMetaEngine : public AdvancedMetaEngine {
 public:
 	ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) {
-		params.singleid = "toon";
-		params.fileBasedFallback = Toon::fileBasedFallback;
-		params.depth = 3;
-		params.directoryGlobs = directoryGlobs;
+		_singleid = "toon";
+		_maxScanDepth = 3;
+		_directoryGlobs = directoryGlobs;
 	}
+
+	virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+		return detectGameFilebased(allFiles, Toon::fileBasedFallback);
+	}
+
 	virtual const char *getName() const {
 		return "Toon";
 	}