From 31ba12c800f55d3611c36838a18e4276dec239ff Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 12 Oct 2003 19:10:17 +0000
Subject: some more target<->game cleanup

svn-id: r10769
---
 sword2/controls.cpp  | 4 ++--
 sword2/save_rest.cpp | 8 ++++----
 sword2/sword2.cpp    | 4 ++--
 sword2/sword2.h      | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'sword2')

diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index ced13f899b..80e1226645 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -893,7 +893,7 @@ int32 OptionsDialog::writeOptionSettings(void) {
 	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 @@ int32 Gui::readOptionSettings(void) {
 	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;
diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp
index 2f24fb8c77..acd3ae70f3 100644
--- a/sword2/save_rest.cpp
+++ b/sword2/save_rest.cpp
@@ -241,7 +241,7 @@ uint32 SaveData(uint16 slotNo, uint8 *buffer, uint32 bufferSize) {
 	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 RestoreData(uint16 slotNo, uint8 *buffer, uint32 bufferSize) {
  	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 @@ uint32 GetSaveDescription(uint16 slotNo, uint8 *description) {
 	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 @@ bool SaveExists(uint16 slotNo) {
 	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;
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 3e7491261d..d4cadde9de 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -104,7 +104,7 @@ Sword2Engine::Sword2Engine(GameDetector *detector, OSystem *syst)
 	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(GameDetector *detector, OSystem *syst)
 }
 
 Sword2Engine::~Sword2Engine() {
-	free(_gameName);
+	free(_targetName);
 	delete _sound;
 }
 
diff --git a/sword2/sword2.h b/sword2/sword2.h
index 282d8334fe..a8a7354491 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -75,7 +75,7 @@ public:
 	GameDetector *_detector;
 	uint32 _features;
 	byte _gameId;
-	char *_gameName; // target name for saves
+	char *_targetName; // target name for saves
 	Sound *_sound;
 	Common::RandomSource _rnd;
 
-- 
cgit v1.2.3