aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/base_game.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-12-09 16:53:33 +0100
committerEinar Johan Trøan Sømåen2012-12-09 16:53:33 +0100
commit4985a89b36993c4e9e7c1850de2c2f940c330ed7 (patch)
treefd69f9a811385afd8794b56bca7e2a185d9bfac0 /engines/wintermute/base/base_game.cpp
parent6a0f72bee051a98dd3f08e83cf068b0618faf2e7 (diff)
downloadscummvm-rg350-4985a89b36993c4e9e7c1850de2c2f940c330ed7.tar.gz
scummvm-rg350-4985a89b36993c4e9e7c1850de2c2f940c330ed7.tar.bz2
scummvm-rg350-4985a89b36993c4e9e7c1850de2c2f940c330ed7.zip
WINTERMUTE: Mark savedGameExt and localSaveDir for eventual removal.
Diffstat (limited to 'engines/wintermute/base/base_game.cpp')
-rw-r--r--engines/wintermute/base/base_game.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 854e40c5a5..02dc6d061a 100644
--- 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: