[Scummvm-cvs-logs] CVS: scummvm/common engine.cpp,1.23,1.24 engine.h,1.29,1.30 gameDetector.cpp,1.122,1.123

Jonathan Gray khalek at users.sourceforge.net
Sun Jul 27 18:51:07 CEST 2003


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

Modified Files:
	engine.cpp engine.h gameDetector.cpp 
Log Message:
bs2

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- engine.cpp	15 Jul 2003 02:16:33 -0000	1.23
+++ engine.cpp	28 Jul 2003 01:50:23 -0000	1.24
@@ -144,6 +144,13 @@
 	}
 #endif
 
+#ifndef DISABLE_BS2
+	if (detector->_game.id >= GID_BS2_FIRST && detector->_game.id <= GID_BS2_LAST) {
+		// Broken Sword 2
+		engine = Engine_BS2_create(detector, syst);
+	}
+#endif
+	
 	return engine;
 }
 

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- engine.h	15 Jul 2003 02:16:33 -0000	1.29
+++ engine.h	28 Jul 2003 01:50:23 -0000	1.30
@@ -38,7 +38,11 @@
 
 	// Beneath a Steel Sky
 	GID_SKY_FIRST,
-	GID_SKY_LAST = GID_SKY_FIRST + 49
+	GID_SKY_LAST = GID_SKY_FIRST + 49,
+
+	// Broken Sword 2
+	GID_BS2_FIRST,
+	GID_BS2_LAST = GID_BS2_FIRST + 49
 };
 
 
@@ -110,6 +114,11 @@
 #ifndef DISABLE_SKY
 extern const VersionSettings *Engine_SKY_targetList();
 extern Engine *Engine_SKY_create(GameDetector *detector, OSystem *syst);
+#endif
+
+#ifndef DISABLE_BS2
+extern const VersionSettings *Engine_BS2_targetList();
+extern Engine *Engine_BS2_create(GameDetector *detector, OSystem *syst);
 #endif
 
 #endif

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- gameDetector.cpp	28 Jul 2003 01:36:16 -0000	1.122
+++ gameDetector.cpp	28 Jul 2003 01:50:23 -0000	1.123
@@ -223,6 +223,12 @@
 		int skyCount = countVersions(skyVersions);
 		totalCount += skyCount;
 #endif
+
+#ifndef DISABLE_BS2
+		const VersionSettings *bs2Versions = Engine_BS2_targetList();
+		int bs2Count = countVersions(bs2Versions);
+		totalCount += bs2Count;
+#endif
 		
 		VersionSettings *v = (VersionSettings *)calloc(totalCount + 1, sizeof(VersionSettings));
 		version_settings = v;
@@ -241,6 +247,12 @@
 		memcpy(v, skyVersions, skyCount * sizeof(VersionSettings));
 		v += skyCount;
 #endif
+
+#ifndef DISABLE_BS2
+		memcpy(v, bs2Versions, bs2Count * sizeof(VersionSettings));
+		v += bs2Count;
+#endif
+
 	}
 }
 





More information about the Scummvm-git-logs mailing list