[Scummvm-cvs-logs] CVS: scummvm/common engine.cpp,1.25,1.26 engine.h,1.30,1.31 gameDetector.cpp,1.124,1.125

Oliver Kiehl olki at users.sourceforge.net
Wed Jul 30 12:26:12 CEST 2003


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

Modified Files:
	engine.cpp engine.h gameDetector.cpp 
Log Message:
rename bs2 to sword2 to have the same name as the original engine.
besides this way all our engines start with an "s" ;)


Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- engine.cpp	28 Jul 2003 12:59:39 -0000	1.25
+++ engine.cpp	30 Jul 2003 19:25:30 -0000	1.26
@@ -144,10 +144,10 @@
 	}
 #endif
 
-#ifndef DISABLE_BS2
-	if (detector->_game.id >= GID_BS2_FIRST && detector->_game.id <= GID_BS2_LAST) {
+#ifndef DISABLE_SWORD2
+	if (detector->_game.id >= GID_SWORD2_FIRST && detector->_game.id <= GID_SWORD2_LAST) {
 		// Broken Sword 2
-		engine = Engine_BS2_create(detector, syst);
+		engine = Engine_SWORD2_create(detector, syst);
 	}
 #endif
 	

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- engine.h	28 Jul 2003 01:50:23 -0000	1.30
+++ engine.h	30 Jul 2003 19:25:31 -0000	1.31
@@ -41,8 +41,8 @@
 	GID_SKY_LAST = GID_SKY_FIRST + 49,
 
 	// Broken Sword 2
-	GID_BS2_FIRST,
-	GID_BS2_LAST = GID_BS2_FIRST + 49
+	GID_SWORD2_FIRST,
+	GID_SWORD2_LAST = GID_SWORD2_FIRST + 49
 };
 
 
@@ -116,9 +116,9 @@
 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);
+#ifndef DISABLE_SWORD2
+extern const VersionSettings *Engine_SWORD2_targetList();
+extern Engine *Engine_SWORD2_create(GameDetector *detector, OSystem *syst);
 #endif
 
 #endif

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- gameDetector.cpp	29 Jul 2003 12:13:39 -0000	1.124
+++ gameDetector.cpp	30 Jul 2003 19:25:31 -0000	1.125
@@ -231,10 +231,10 @@
 		totalCount += skyCount;
 #endif
 
-#ifndef DISABLE_BS2
-		const VersionSettings *bs2Versions = Engine_BS2_targetList();
-		int bs2Count = countVersions(bs2Versions);
-		totalCount += bs2Count;
+#ifndef DISABLE_SWORD2
+		const VersionSettings *sword2Versions = Engine_SWORD2_targetList();
+		int sword2Count = countVersions(sword2Versions);
+		totalCount += sword2Count;
 #endif
 		
 		VersionSettings *v = (VersionSettings *)calloc(totalCount + 1, sizeof(VersionSettings));
@@ -255,9 +255,9 @@
 		v += skyCount;
 #endif
 
-#ifndef DISABLE_BS2
-		memcpy(v, bs2Versions, bs2Count * sizeof(VersionSettings));
-		v += bs2Count;
+#ifndef DISABLE_SWORD2
+		memcpy(v, sword2Versions, sword2Count * sizeof(VersionSettings));
+		v += sword2Count;
 #endif
 
 	}





More information about the Scummvm-git-logs mailing list