[Scummvm-cvs-logs] SF.net SVN: scummvm: [25241] scummvm/trunk

[sev at users.sourceforge.net]

Revision: 25241
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25241&view=rev
Author:   sev
Date:     2007-01-27 23:31:26 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
Add more paramteres to AdvancedDetector. Not used yet.

Modified Paths:
--------------
    scummvm/trunk/common/advancedDetector.h
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agos/game.cpp
    scummvm/trunk/engines/cine/detection.cpp
    scummvm/trunk/engines/kyra/plugin.cpp
    scummvm/trunk/engines/parallaction/detection.cpp
    scummvm/trunk/engines/saga/game.cpp

Modified: scummvm/trunk/common/advancedDetector.h
===================================================================
--- scummvm/trunk/common/advancedDetector.h	2007-01-28 01:01:36 UTC (rev 25240)
+++ scummvm/trunk/common/advancedDetector.h	2007-01-28 07:31:26 UTC (rev 25241)
@@ -51,6 +51,10 @@
 	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 @@
 	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 {

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2007-01-28 01:01:36 UTC (rev 25240)
+++ scummvm/trunk/engines/agi/detection.cpp	2007-01-28 07:31:26 UTC (rev 25241)
@@ -971,7 +971,11 @@
 	// 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);

Modified: scummvm/trunk/engines/agos/game.cpp
===================================================================
--- scummvm/trunk/engines/agos/game.cpp	2007-01-28 01:01:36 UTC (rev 25240)
+++ scummvm/trunk/engines/agos/game.cpp	2007-01-28 07:31:26 UTC (rev 25241)
@@ -92,7 +92,11 @@
 	// 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);

Modified: scummvm/trunk/engines/cine/detection.cpp
===================================================================
--- scummvm/trunk/engines/cine/detection.cpp	2007-01-28 01:01:36 UTC (rev 25240)
+++ scummvm/trunk/engines/cine/detection.cpp	2007-01-28 07:31:26 UTC (rev 25241)
@@ -440,7 +440,11 @@
 	// 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);

Modified: scummvm/trunk/engines/kyra/plugin.cpp
===================================================================
--- scummvm/trunk/engines/kyra/plugin.cpp	2007-01-28 01:01:36 UTC (rev 25240)
+++ scummvm/trunk/engines/kyra/plugin.cpp	2007-01-28 07:31:26 UTC (rev 25241)
@@ -88,6 +88,10 @@
 	// List of all engine targets
 	gameList,
 	// Structure for autoupgrading obsolete targets
+	0,
+	// Name of single gameid (optional)
+	0,
+	// Flags
 	0
 };
 

Modified: scummvm/trunk/engines/parallaction/detection.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/detection.cpp	2007-01-28 01:01:36 UTC (rev 25240)
+++ scummvm/trunk/engines/parallaction/detection.cpp	2007-01-28 07:31:26 UTC (rev 25241)
@@ -89,7 +89,11 @@
 	// 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);

Modified: scummvm/trunk/engines/saga/game.cpp
===================================================================
--- scummvm/trunk/engines/saga/game.cpp	2007-01-28 01:01:36 UTC (rev 25240)
+++ scummvm/trunk/engines/saga/game.cpp	2007-01-28 07:31:26 UTC (rev 25241)
@@ -104,7 +104,11 @@
 	// 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.