[Scummvm-cvs-logs] SF.net SVN: scummvm: [25167] scummvm/trunk/engines/saga

sev at users.sourceforge.net sev at users.sourceforge.net
Thu Jan 25 00:13:01 CET 2007


Revision: 25167
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25167&view=rev
Author:   sev
Date:     2007-01-24 15:13:00 -0800 (Wed, 24 Jan 2007)

Log Message:
-----------
Sync with last AdvancedDetector changes

Modified Paths:
--------------
    scummvm/trunk/engines/saga/game.cpp
    scummvm/trunk/engines/saga/sagagame.cpp

Modified: scummvm/trunk/engines/saga/game.cpp
===================================================================
--- scummvm/trunk/engines/saga/game.cpp	2007-01-24 22:57:40 UTC (rev 25166)
+++ scummvm/trunk/engines/saga/game.cpp	2007-01-24 23:13:00 UTC (rev 25167)
@@ -85,28 +85,40 @@
 static GameList GAME_detectGames(const FSList &fslist);
 }
 
-static const PlainGameDescriptor saga_games[] = {
+static const PlainGameDescriptor sagaGames[] = {
 	{"ite", "Inherit the Earth: Quest for the Orb"},
 	{"ihnm", "I Have No Mouth and I Must Scream"},
 	{0, 0}
 };
 
-ADVANCED_DETECTOR_DEFINE_PLUGIN(SAGA, Saga::SagaEngine, Saga::GAME_detectGames, saga_games, 0);
+namespace Saga {
 
+#include "sagagame.cpp"
 
+}
+
+static const Common::ADParams detectionParams = {
+	// Pointer to ADGameDescription or its superset structure
+	(const byte *)Saga::gameDescriptions,
+	// Size of that superset structure
+	sizeof(Saga::SAGAGameDescription),
+	// Number of bytes to compute MD5 sum for
+	5000,
+	// List of all engine targets
+	sagaGames,
+	// Structure for autoupgrading obsolete targets
+	0
+};
+
+ADVANCED_DETECTOR_DEFINE_PLUGIN(SAGA, Saga::SagaEngine, Saga::GAME_detectGames, detectionParams);
+
 REGISTER_PLUGIN(SAGA, "SAGA Engine", "Inherit the Earth (C) Wyrmkeep Entertainment");
 
 namespace Saga {
 
-#include "sagagame.cpp"
+bool SagaEngine::initGame() {
+	int i = Common::ADVANCED_DETECTOR_DETECT_INIT_GAME(detectionParams);
 
-bool SagaEngine::initGame() {
-	int i = Common::ADVANCED_DETECTOR_DETECT_INIT_GAME(
-		(const byte *)gameDescriptions,
-		sizeof(SAGAGameDescription),
-		FILE_MD5_BYTES,
-		saga_games
-		);
 	_gameDescription = &gameDescriptions[i];
 
 	_gameDisplayInfo = *_gameDescription->gameDisplayInfo;
@@ -117,13 +129,7 @@
 }
 
 GameList GAME_detectGames(const FSList &fslist) {
-	return Common::ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION(
-		fslist,
-		(const byte *)gameDescriptions,
-		sizeof(SAGAGameDescription),
-		FILE_MD5_BYTES,
-		saga_games
-	);
+	return Common::ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION(fslist, detectionParams);
 }
 
 } // End of namespace Saga

Modified: scummvm/trunk/engines/saga/sagagame.cpp
===================================================================
--- scummvm/trunk/engines/saga/sagagame.cpp	2007-01-24 22:57:40 UTC (rev 25166)
+++ scummvm/trunk/engines/saga/sagagame.cpp	2007-01-24 23:13:00 UTC (rev 25167)
@@ -560,8 +560,6 @@
 	true
 };
 
-#define FILE_MD5_BYTES 5000
-
 static const SAGAGameDescription gameDescriptions[] = {
 	// Inherit the earth - DOS Demo version
 	// sound unchecked


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




More information about the Scummvm-git-logs mailing list