[Scummvm-cvs-logs] CVS: scummvm/bs2 sword2.cpp,1.56,1.57

Max Horn fingolfin at users.sourceforge.net
Sun Oct 12 11:41:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv28202/bs2

Modified Files:
	sword2.cpp 
Log Message:
some renaming for more consistent terminology (although we might want to reevaluate this): 'target' is what is in your config file; 'game' is what a frontend provide. E.g. the scumm frontend provides the game 'monkeyvga', and my config file has target 'monkeyvga-ger' configured to use that game

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sword2.cpp	12 Oct 2003 14:40:04 -0000	1.56
+++ sword2.cpp	12 Oct 2003 18:40:08 -0000	1.57
@@ -48,7 +48,7 @@
 
 extern uint16 _debugLevel;
 
-static const TargetSettings sword2_settings[] = {
+static const GameSettings sword2_settings[] = {
 	/* Broken Sword 2 */
 	{"sword2", "Broken Sword II", GID_SWORD2, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" },
 	{"sword2alt", "Broken Sword II (alt)", GID_SWORD2, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "r2ctlns.ocx" },
@@ -56,7 +56,7 @@
 	{NULL, NULL, 0, 0, MDT_NONE, 0, NULL}
 };
 
-const TargetSettings *Engine_SWORD2_targetList() {
+const GameSettings *Engine_SWORD2_targetList() {
 	return sword2_settings;
 }
 
@@ -104,7 +104,7 @@
 	g_sword2 = this;
 	_features = detector->_game.features;
 	_gameId = detector->_game.id;
-	_gameName = strdup(detector->_gameFileName.c_str());
+	_gameName = strdup(detector->_targetName.c_str());
 	_bootParam = ConfMan.getInt("boot_param");
 	_saveSlot = ConfMan.getInt("save_slot");
 	_debugLevel = ConfMan.getInt("debuglevel");





More information about the Scummvm-git-logs mailing list