Advanced Detector: Changed fallback detector from a callback function pointer to an overrideable method of AdvancedMetaEngine

svn-id: r31119

12 files changed, 8 insertions, 22 deletions

diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index c9fdde4ac4..d2912898ea 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -2255,8 +2255,6 @@ static const Common::ADParams detectionParams = {
 	"agi",
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	Agi::fallbackDetector,
 	// Flags
 	Common::kADFlagAugmentPreferredTarget
 };
@@ -2273,6 +2271,10 @@ public:
 	}
 
 	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+
+	Common::EncapsulatedADGameDesc fallbackDetect(const FSList *fslist) const {
+		return Agi::fallbackDetector(fslist);
+	}
 };
 
 bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 03b3322555..ce3e4f34de 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -93,8 +93,6 @@ static const Common::ADParams detectionParams = {
 	0,
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	0,
 	// Flags
 	Common::kADFlagAugmentPreferredTarget
 };
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 6c05c9a2e2..d9765a6b5c 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -482,8 +482,6 @@ static const Common::ADParams detectionParams = {
 	"cine",
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	0,
 	// Flags
 	Common::kADFlagAugmentPreferredTarget
 };
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index 568c131b31..07d2ab7c8e 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -117,8 +117,6 @@ static const Common::ADParams detectionParams = {
 	"cruise",
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	0,
 	// Flags
 	Common::kADFlagAugmentPreferredTarget
 };
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index e3b5b0dc44..3c9ac41ba4 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -157,8 +157,6 @@ static const Common::ADParams detectionParams = {
 	"drascula",
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	Drascula::fallbackDetector,
 	// Flags
 	Common::kADFlagAugmentPreferredTarget
 };
@@ -176,6 +174,10 @@ public:
 	}
 
 	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+
+	Common::EncapsulatedADGameDesc fallbackDetect(const FSList *fslist) const {
+		return Drascula::fallbackDetector(fslist);
+	}
 };
 
 bool DrasculaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index 8fcaeb7530..f3ff11ba75 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -1853,8 +1853,6 @@ static const ADParams detectionParams = {
 	"gob",
 	// List of files for file-based fallback detection (optional)
 	Gob::fileBased,
-	// Fallback callback
-	0,
 	// Flags
 	kADFlagAugmentPreferredTarget
 };
diff --git a/engines/igor/detection.cpp b/engines/igor/detection.cpp
index c86d027a91..c938a77c1e 100644
--- a/engines/igor/detection.cpp
+++ b/engines/igor/detection.cpp
@@ -101,7 +101,6 @@ static const Common::ADParams igorDetectionParams = {
 	0,
 	"igor",
 	0,
-	0,
 	Common::kADFlagAugmentPreferredTarget
 };
 
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index f76a435b8a..f02c23a127 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -422,8 +422,6 @@ const Common::ADParams detectionParams = {
 	0,
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	0,
 	// Flags
 	0
 };
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index 6138bbc3a5..e7b4d1bcd8 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -168,8 +168,6 @@ static const Common::ADParams detectionParams = {
 	"lure",
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	0,
 	// Flags
 	Common::kADFlagAugmentPreferredTarget | Common::kADFlagUseExtraAsHint
 };
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 4d8b54085a..c608f58100 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -178,8 +178,6 @@ static const Common::ADParams detectionParams = {
 	"parallaction",
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	0,
 	// Flags
 	Common::kADFlagAugmentPreferredTarget
 };
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 1a04c7a001..2ac314cf73 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -135,8 +135,6 @@ static const Common::ADParams detectionParams = {
 	"saga",
 	// List of files for file-based fallback detection (optional)
 	0,
-	// Fallback callback
-	0,
 	// Flags
 	Common::kADFlagAugmentPreferredTarget
 };
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 2b85f9f489..2fde7e9da1 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -120,7 +120,6 @@ static const Common::ADParams detectionParams = {
 	0, // no obsolete targets data
 	"touche",
 	Touche::fileBasedFallback, // file-based detection data to enable not yet known versions to start
-	0, // no fallback callback
 	Common::kADFlagAugmentPreferredTarget | Common::kADFlagPrintWarningOnFileBasedFallback
 };