[Scummvm-cvs-logs] CVS: scummvm/common engine.cpp,1.13,1.14 engine.h,1.14,1.15 gameDetector.cpp,1.79,1.80 gameDetector.h,1.28,1.29

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv29862/common

Modified Files:
	engine.cpp engine.h gameDetector.cpp gameDetector.h 
Log Message:
Patch #697312: Beneath a Steel Sky interim/initial support patch

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- engine.cpp	1 Mar 2003 22:06:53 -0000	1.13
+++ engine.cpp	5 Mar 2003 19:04:26 -0000	1.14
@@ -87,6 +87,9 @@
 	} else if (detector->_gameId >= GID_SCUMM_FIRST && detector->_gameId <= GID_SCUMM_LAST) {
 		// Some kind of Scumm game
 		engine = Engine_SCUMM_create(detector, syst);
+	} else if (detector->_gameId >= GID_SKY_FIRST && detector->_gameId <= GID_SKY_LAST) {
+		// Beneath a Steel Sky
+		engine = Engine_SKY_create(detector, syst);
 	} else {
 		// Unknown game
 	}

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- engine.h	1 Mar 2003 22:04:46 -0000	1.14
+++ engine.h	5 Mar 2003 19:04:28 -0000	1.15
@@ -78,9 +78,11 @@
 // 2) Faster (compiler doesn't have to parse lengthy header files)
 extern Engine *Engine_SIMON_create(GameDetector *detector, OSystem *syst);
 extern Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst);
+extern Engine *Engine_SKY_create(GameDetector *detector, OSystem *syst);
 
 extern const VersionSettings *Engine_SIMON_targetList();
 extern const VersionSettings *Engine_SCUMM_targetList();
+extern const VersionSettings *Engine_SKY_targetList();
 
 #endif
 

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- gameDetector.cpp	2 Mar 2003 16:36:51 -0000	1.79
+++ gameDetector.cpp	5 Mar 2003 19:04:29 -0000	1.80
@@ -191,12 +191,16 @@
 		// Gather & combine the target lists from the modules
 		const VersionSettings *scummVersions = Engine_SCUMM_targetList();
 		const VersionSettings *simonVersions = Engine_SIMON_targetList();
+		const VersionSettings *skyVersions = Engine_SKY_targetList();
+		
 		int scummCount = countVersions(scummVersions);
 		int simonCount = countVersions(simonVersions);
+		int skyCount = countVersions(skyVersions);
 		
-		VersionSettings *v = (VersionSettings *)calloc(scummCount + simonCount + 1, sizeof(VersionSettings));
+		VersionSettings *v = (VersionSettings *)calloc(scummCount + simonCount + skyCount + 1, sizeof(VersionSettings));
 		memcpy(v, scummVersions, scummCount * sizeof(VersionSettings));
 		memcpy(v+scummCount, simonVersions, simonCount * sizeof(VersionSettings));
+		memcpy(v+skyCount, skyVersions, skyCount * sizeof(VersionSettings));
 		version_settings = v;
 	}
 }

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gameDetector.h	1 Mar 2003 22:54:16 -0000	1.28
+++ gameDetector.h	5 Mar 2003 19:04:31 -0000	1.29
@@ -40,7 +40,11 @@
 
 	// Simon the Sorcerer
 	GID_SIMON_FIRST,
-	GID_SIMON_LAST = GID_SIMON_FIRST + 99
+	GID_SIMON_LAST = GID_SIMON_FIRST + 99,
+
+	// Beneath a Steel Sky
+	GID_SKY_FIRST,
+	GID_SKY_LAST = GID_SKY_FIRST + 99
 };
 
 // TODO: the GameFeatures really should be moved to scumm/scumm.h, too