[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.178,2.179 scummvm.cpp,2.301,2.302 dialogs.cpp,1.64,1.65
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.6,1.7 build_display.cpp,1.8,1.9 build_display.h,1.2,1.3 console.cpp,1.4,1.5 console.h,1.3,1.4 controls.cpp,1.5,1.6 debug.cpp,1.4,1.5 debug.h,1.3,1.4 function.cpp,1.4,1.5 icons.cpp,1.3,1.4 interpreter.h,1.4,1.5 layers.cpp,1.3,1.4 logic.cpp,1.3,1.4 maketext.cpp,1.5,1.6 mouse.cpp,1.6,1.7 protocol.cpp,1.3,1.4 resman.cpp,1.9,1.10 router.cpp,1.5,1.6 save_rest.cpp,1.5,1.6 sound.cpp,1.6,1.7 speech.cpp,1.9,1.10 startup.cpp,1.6,1.7 sword2.cpp,1.7,1.8 sword2.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.178,2.179 scummvm.cpp,2.301,2.302 dialogs.cpp,1.64,1.65
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.6,1.7 build_display.cpp,1.8,1.9 build_display.h,1.2,1.3 console.cpp,1.4,1.5 console.h,1.3,1.4 controls.cpp,1.5,1.6 debug.cpp,1.4,1.5 debug.h,1.3,1.4 function.cpp,1.4,1.5 icons.cpp,1.3,1.4 interpreter.h,1.4,1.5 layers.cpp,1.3,1.4 logic.cpp,1.3,1.4 maketext.cpp,1.5,1.6 mouse.cpp,1.6,1.7 protocol.cpp,1.3,1.4 resman.cpp,1.9,1.10 router.cpp,1.5,1.6 save_rest.cpp,1.5,1.6 sound.cpp,1.6,1.7 speech.cpp,1.9,1.10 startup.cpp,1.6,1.7 sword2.cpp,1.7,1.8 sword2.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list