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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu Mar 9 06:36:03 CET 2006


Revision: 21181
Author:   fingolfin
Date:     2006-03-09 06:33:07 -0800 (Thu, 09 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21181&view=rev

Log Message:
-----------
Moved SAGA plugin interface code from saga.cpp to game.cpp

Modified Paths:
--------------
    scummvm/trunk/engines/saga/game.cpp
    scummvm/trunk/engines/saga/saga.cpp
    scummvm/trunk/engines/saga/saga.h
Modified: scummvm/trunk/engines/saga/game.cpp
===================================================================
--- scummvm/trunk/engines/saga/game.cpp	2006-03-09 14:30:43 UTC (rev 21180)
+++ scummvm/trunk/engines/saga/game.cpp	2006-03-09 14:33:07 UTC (rev 21181)
@@ -49,7 +49,49 @@
 #define IHNM_CONVERSE_TEXT_LINES	10
 
 namespace Saga {
+static DetectedGameList GAME_ProbeGame(const FSList &fslist, int **matches = NULL);
+}
 
+static const PlainGameDescriptor saga_games[] = {
+	{"ite", "Inherit the Earth: Quest for the Orb"},
+	{"ihnm", "I Have No Mouth and I Must Scream"},
+	{0, 0}
+};
+
+GameList Engine_SAGA_gameIDList() {
+	GameList games;
+	const PlainGameDescriptor *g = saga_games;
+
+	while (g->gameid) {
+		games.push_back(*g);
+		g++;
+	}
+
+	return games;
+}
+
+GameDescriptor Engine_SAGA_findGameID(const char *gameid) {
+	const PlainGameDescriptor *g = saga_games;
+	while (g->gameid) {
+		if (0 == scumm_stricmp(gameid, g->gameid))
+			break;
+		g++;
+	}
+	return *g;
+}
+
+DetectedGameList Engine_SAGA_detectGames(const FSList &fslist) {
+	return Saga::GAME_ProbeGame(fslist);
+}
+
+Engine *Engine_SAGA_create(GameDetector *detector, OSystem *syst) {
+	return new Saga::SagaEngine(detector, syst);
+}
+
+REGISTER_PLUGIN(SAGA, "SAGA Engine")
+
+namespace Saga {
+
 static int detectGame(const FSList &fslist, bool mode = false, int start = -1);
 
 // ITE section

Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp	2006-03-09 14:30:43 UTC (rev 21180)
+++ scummvm/trunk/engines/saga/saga.cpp	2006-03-09 14:33:07 UTC (rev 21181)
@@ -24,8 +24,6 @@
 #include "common/stdafx.h"
 
 #include "base/gameDetector.h"
-#include "base/plugins.h"
-#include "backends/fs/fs.h"
 
 #include "common/file.h"
 #include "common/config-manager.h"
@@ -56,44 +54,6 @@
 #include "saga/objectmap.h"
 #include "saga/resnames.h"
 
-static const PlainGameDescriptor saga_games[] = {
-	{"ite", "Inherit the Earth: Quest for the Orb"},
-	{"ihnm", "I Have No Mouth and I Must Scream"},
-	{0, 0}
-};
-
-GameList Engine_SAGA_gameIDList() {
-	GameList games;
-	const PlainGameDescriptor *g = saga_games;
-
-	while (g->gameid) {
-		games.push_back(*g);
-		g++;
-	}
-
-	return games;
-}
-
-GameDescriptor Engine_SAGA_findGameID(const char *gameid) {
-	const PlainGameDescriptor *g = saga_games;
-	while (g->gameid) {
-		if (0 == scumm_stricmp(gameid, g->gameid))
-			break;
-		g++;
-	}
-	return *g;
-}
-
-DetectedGameList Engine_SAGA_detectGames(const FSList &fslist) {
-	return Saga::GAME_ProbeGame(fslist);
-}
-
-Engine *Engine_SAGA_create(GameDetector *detector, OSystem *syst) {
-	return new Saga::SagaEngine(detector, syst);
-}
-
-REGISTER_PLUGIN(SAGA, "SAGA Engine")
-
 namespace Saga {
 
 #define MAX_TIME_DELTA 100

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2006-03-09 14:30:43 UTC (rev 21180)
+++ scummvm/trunk/engines/saga/saga.h	2006-03-09 14:33:07 UTC (rev 21181)
@@ -26,7 +26,6 @@
 #define SAGA_H
 
 #include "base/engine.h"
-#include "base/plugins.h"
 
 #include "common/stream.h"
 
@@ -563,8 +562,6 @@
 }
 
 
-DetectedGameList GAME_ProbeGame(const FSList &fslist, int **matches = NULL);
-
 class SagaEngine : public Engine {
 	friend class Scene;
 


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