[Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.30,1.31 save_rest.cpp,1.26,1.27 sword2.cpp,1.57,1.58 sword2.h,1.20,1.21

[Max Horn]

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

Modified Files:
	controls.cpp save_rest.cpp sword2.cpp sword2.h 
Log Message:
some more target<->game cleanup

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- controls.cpp	12 Oct 2003 14:40:03 -0000	1.30
+++ controls.cpp	12 Oct 2003 19:10:15 -0000	1.31
@@ -893,7 +893,7 @@
 	SaveFile *fp;
 	SaveFileManager *mgr = g_system->get_savefile_manager();
 	
-	sprintf(filename, "%s-settings.dat", g_sword2->_gameName);
+	sprintf(filename, "%s-settings.dat", g_sword2->_targetName);
 
 	buff[0] = g_sound->getMusicVolume();
 	buff[1] = g_sound->getSpeechVolume();
@@ -1483,7 +1483,7 @@
 	SaveFile *fp;
 	SaveFileManager *mgr = g_system->get_savefile_manager();
 	
-	sprintf(filename, "%s-settings.dat", g_sword2->_gameName);
+	sprintf(filename, "%s-settings.dat", g_sword2->_targetName);
 
 	if (!(fp = mgr->open_savefile(filename, g_sword2->getSavePath(), false)))
 		return 1;

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- save_rest.cpp	12 Oct 2003 14:40:03 -0000	1.26
+++ save_rest.cpp	12 Oct 2003 19:10:15 -0000	1.27
@@ -241,7 +241,7 @@
 	SaveFileManager *mgr = g_system->get_savefile_manager();
 
 	// construct filename
-	sprintf(saveFileName, "%s.%.3d", g_sword2->_gameName, slotNo);
+	sprintf(saveFileName, "%s.%.3d", g_sword2->_targetName, slotNo);
 	
 	if (!(out = mgr->open_savefile(saveFileName, g_sword2->getSavePath(), true))) {
 		// error: couldn't open file
@@ -304,7 +304,7 @@
  	uint32 itemsRead;
 
 	// construct filename
-	sprintf(saveFileName, "%s.%.3d", g_sword2->_gameName, slotNo);
+	sprintf(saveFileName, "%s.%.3d", g_sword2->_targetName, slotNo);
 
 	if (!(in = mgr->open_savefile(saveFileName, g_sword2->getSavePath(), false))) {
 		// error: couldn't open file
@@ -469,7 +469,7 @@
 	SaveFileManager *mgr = g_system->get_savefile_manager();
 
 	// construct filename
-	sprintf(saveFileName, "%s.%.3d", g_sword2->_gameName, slotNo);
+	sprintf(saveFileName, "%s.%.3d", g_sword2->_targetName, slotNo);
 
 	if (!(in = mgr->open_savefile(saveFileName, g_sword2->getSavePath(), false))) {
 		// error: couldn't open file
@@ -492,7 +492,7 @@
 	SaveFile *in;
 
 	// construct filename
-	sprintf(saveFileName, "%s.%.3d", g_sword2->_gameName, slotNo);
+	sprintf(saveFileName, "%s.%.3d", g_sword2->_targetName, slotNo);
 
 	if (!(in = mgr->open_savefile(saveFileName, g_sword2->getSavePath(), false))) {
 		delete mgr;

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- sword2.cpp	12 Oct 2003 18:40:08 -0000	1.57
+++ sword2.cpp	12 Oct 2003 19:10:16 -0000	1.58
@@ -104,7 +104,7 @@
 	g_sword2 = this;
 	_features = detector->_game.features;
 	_gameId = detector->_game.id;
-	_gameName = strdup(detector->_targetName.c_str());
+	_targetName = strdup(detector->_targetName.c_str());
 	_bootParam = ConfMan.getInt("boot_param");
 	_saveSlot = ConfMan.getInt("save_slot");
 	_debugLevel = ConfMan.getInt("debuglevel");
@@ -123,7 +123,7 @@
 }
 
 Sword2Engine::~Sword2Engine() {
-	free(_gameName);
+	free(_targetName);
 	delete _sound;
 }
 

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sword2.h	12 Oct 2003 14:40:04 -0000	1.20
+++ sword2.h	12 Oct 2003 19:10:16 -0000	1.21
@@ -75,7 +75,7 @@
 	GameDetector *_detector;
 	uint32 _features;
 	byte _gameId;
-	char *_gameName; // target name for saves
+	char *_targetName; // target name for saves
 	Sound *_sound;
 	Common::RandomSource _rnd;