WINTERMUTE: Mark savedGameExt and localSaveDir for eventual removal.

scummvm · Dec 9, 2012 · 4985a89 · 4985a89
1 parent 6a0f72b
commit 4985a89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
@@ -193,11 +193,9 @@ BaseGame::BaseGame(const Common::String &gameId) : BaseObject(this), _gameId(gam
 	_thumbnailWidth = _thumbnailHeight = 0;
 
 	_richSavedGames = false;
-	_savedGameExt = NULL;
-	BaseUtils::setString(&_savedGameExt, "dsv");
+	_savedGameExt = "dsv";
+	_localSaveDir = "saves";
 
-	_localSaveDir = NULL;
-	BaseUtils::setString(&_localSaveDir, "saves");
 	_saveDirChecked = false;
 
 	_loadingIcon = NULL;
@@ -255,9 +253,7 @@ BaseGame::~BaseGame() {
 
 	cleanup();
 
-	delete[] _localSaveDir;
 	delete[] _settingsGameFile;
-	delete[] _savedGameExt;
 
 	delete _cachedThumbnail;
 
@@ -276,9 +272,7 @@ BaseGame::~BaseGame() {
 	delete _stringTable;
 	delete _musicSystem;
 
-	_localSaveDir = NULL;
 	_settingsGameFile = NULL;
-	_savedGameExt = NULL;
 
 	_cachedThumbnail = NULL;
 
@@ -903,7 +897,7 @@ bool BaseGame::loadBuffer(byte *buffer, bool complete) {
 			break;
 
 		case TOKEN_LOCAL_SAVE_DIR:
-			BaseUtils::setString(&_localSaveDir, (char *)params);
+			_localSaveDir = (char *)params;
 			break;
 
 		case TOKEN_COMPAT_KILL_METHOD_THREADS:
@@ -3166,7 +3160,7 @@ bool BaseGame::loadSettings(const char *filename) {
 			break;
 
 		case TOKEN_SAVED_GAME_EXT:
-			BaseUtils::setString(&_savedGameExt, (char *)params);
+			_savedGameExt = (char *)params;
 			break;
 
 		case TOKEN_GUID:

diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
@@ -273,10 +273,11 @@ class BaseGame: public BaseObject {
 	virtual bool invalidateDeviceObjects();
 	virtual bool restoreDeviceObjects();
 
-	char *_localSaveDir;
+	// TODO: This can probably be removed completely:
 	bool _saveDirChecked;
 	bool _richSavedGames;
-	char *_savedGameExt;
+	Common::String _localSaveDir;
+	Common::String _savedGameExt;
 
 	bool _reportTextureFormat;