Add more paramteres to AdvancedDetector. Not used yet.

svn-id: r25241

7 files changed, 39 insertions, 6 deletions

diff --git a/common/advancedDetector.h b/common/advancedDetector.h
index ee92a82e5b..c5fc2f6ff6 100644
--- a/common/advancedDetector.h
+++ b/common/advancedDetector.h
@@ -51,6 +51,10 @@ struct ADObsoleteGameID {
 	Common::Platform platform;
 };
 
+enum ADFlags {
+	kADFlagComplexID = (1 << 0) // Generate complex suggested IDs
+};
+
 struct ADParams {
 	// Pointer to ADGameDescription or its superset structure
 	const byte *descs;
@@ -60,14 +64,19 @@ struct ADParams {
 	const int md5Bytes;
 	// List of all engine targets
 	const PlainGameDescriptor *list;
-	// Structure for autoupgrading obsolete targets
+	// Structure for autoupgrading obsolete targets (optional)
 	const Common::ADObsoleteGameID *obsoleteList;
+	// Name of single gameid (optional)
+	const char *singleid;
+	// Flags
+	const uint32 flags;
 };
 
 typedef Array<int> ADList;
 typedef Array<const ADGameDescription*> ADGameDescList;
 
 #define AD_ENTRY1(f, x) {{ f, 0, x, -1}, {NULL, 0, NULL, 0}}
+#define AD_ENTRY1s(f, x, s) {{ f, 0, x, s}, {NULL, 0, NULL, 0}}
 
 
 namespace AdvancedDetector {
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index ea90ab559c..e6b1cffb54 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -971,7 +971,11 @@ static const Common::ADParams detectionParams = {
 	// List of all engine targets
 	agiGames,
 	// Structure for autoupgrading obsolete targets
-	0
+	0,
+	// Name of single gameid (optional)
+	"agi",
+	// Flags
+	Common::kADFlagComplexID
 };
 
 ADVANCED_DETECTOR_DEFINE_PLUGIN(AGI, Agi::AgiEngine, Agi::GAME_detectGames, detectionParams);
diff --git a/engines/agos/game.cpp b/engines/agos/game.cpp
index 1282bb9932..89a22caa30 100644
--- a/engines/agos/game.cpp
+++ b/engines/agos/game.cpp
@@ -92,7 +92,11 @@ static const Common::ADParams detectionParams = {
 	// List of all engine targets
 	simonGames,
 	// Structure for autoupgrading obsolete targets
-	obsoleteGameIDsTable
+	obsoleteGameIDsTable,
+	// Name of single gameid (optional)
+	0,
+	// Flags
+	0
 };
 
 ADVANCED_DETECTOR_DEFINE_PLUGIN(AGOS, AGOS::AGOSEngine, AGOS::GAME_detectGames, detectionParams);
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index ca49b77847..d507fef484 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -440,7 +440,11 @@ static const Common::ADParams detectionParams = {
 	// List of all engine targets
 	cineGames,
 	// Structure for autoupgrading obsolete targets
-	0
+	0,
+	// Name of single gameid (optional)
+	"cine",
+	// Flags
+	Common::kADFlagComplexID
 };
 
 ADVANCED_DETECTOR_DEFINE_PLUGIN(CINE, Cine::CineEngine, Cine::GAME_detectGames, detectionParams);
diff --git a/engines/kyra/plugin.cpp b/engines/kyra/plugin.cpp
index 929abe5bd8..b009706109 100644
--- a/engines/kyra/plugin.cpp
+++ b/engines/kyra/plugin.cpp
@@ -88,6 +88,10 @@ const Common::ADParams detectionParams = {
 	// List of all engine targets
 	gameList,
 	// Structure for autoupgrading obsolete targets
+	0,
+	// Name of single gameid (optional)
+	0,
+	// Flags
 	0
 };
 
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 6baea20f86..6bc1590910 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -89,7 +89,11 @@ static const Common::ADParams detectionParams = {
 	// List of all engine targets
 	parallactionGames,
 	// Structure for autoupgrading obsolete targets
-	0
+	0,
+	// Name of single gameid (optional)
+	"parallaction",
+	// Flags
+	Common::kADFlagComplexID
 };
 
 ADVANCED_DETECTOR_DEFINE_PLUGIN(PARALLACTION, Parallaction::Parallaction, Parallaction::GAME_detectGames, detectionParams);
diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp
index d13c02a2ff..3c54e2df3f 100644
--- a/engines/saga/game.cpp
+++ b/engines/saga/game.cpp
@@ -104,7 +104,11 @@ static const Common::ADParams detectionParams = {
 	// List of all engine targets
 	sagaGames,
 	// Structure for autoupgrading obsolete targets
-	0
+	0,
+	// Name of single gameid (optional)
+	"saga",
+	// Flags
+	Common::kADFlagComplexID
 };
 
 ADVANCED_DETECTOR_DEFINE_PLUGIN(SAGA, Saga::SagaEngine, Saga::GAME_detectGames, detectionParams);