diff options
| author | Einar Johan Trøan Sømåen | 2013-11-05 13:54:25 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-11-05 13:54:25 +0100 |
| commit | 237d3d86ecd84fc2084c7739a6ff054e3b0c829b (patch) | |
| tree | fc5151bfaa1d9ceca42e0fc73e69fed845fba85b /engines/wintermute/ad/ad_game.cpp | |
| parent | d07409def7cf63296a11f0cdea3bf5b7e1c3427a (diff) | |
| download | scummvm-rg350-237d3d86ecd84fc2084c7739a6ff054e3b0c829b.tar.gz scummvm-rg350-237d3d86ecd84fc2084c7739a6ff054e3b0c829b.tar.bz2 scummvm-rg350-237d3d86ecd84fc2084c7739a6ff054e3b0c829b.zip | |
WINTERMUTE: Transfer Char* explicitly when saving/loading.
Diffstat (limited to 'engines/wintermute/ad/ad_game.cpp')
| -rw-r--r-- | engines/wintermute/ad/ad_game.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp index e06d6cda59..904b8a541c 100644 --- a/engines/wintermute/ad/ad_game.cpp +++ b/engines/wintermute/ad/ad_game.cpp @@ -1417,8 +1417,8 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) { _objects.persist(persistMgr); - persistMgr->transfer(TMEMBER(_prevSceneName)); - persistMgr->transfer(TMEMBER(_prevSceneFilename)); + persistMgr->transferCharPtr(TMEMBER(_prevSceneName)); + persistMgr->transferCharPtr(TMEMBER(_prevSceneFilename)); persistMgr->transferPtr(TMEMBER_PTR(_responseBox)); _responsesBranch.persist(persistMgr); @@ -1426,7 +1426,7 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) { persistMgr->transferPtr(TMEMBER_PTR(_scene)); _sceneStates.persist(persistMgr); persistMgr->transferBool(TMEMBER(_scheduledFadeIn)); - persistMgr->transfer(TMEMBER(_scheduledScene)); + persistMgr->transferCharPtr(TMEMBER(_scheduledScene)); persistMgr->transferPtr(TMEMBER_PTR(_selectedItem)); persistMgr->transferSint32(TMEMBER_INT(_talkSkipButton)); @@ -1435,14 +1435,14 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) { persistMgr->transferPtr(TMEMBER_PTR(_sceneViewport)); persistMgr->transferSint32(TMEMBER_INT(_stateEx)); persistMgr->transferBool(TMEMBER(_initialScene)); - persistMgr->transfer(TMEMBER(_debugStartupScene)); + persistMgr->transferCharPtr(TMEMBER(_debugStartupScene)); persistMgr->transferPtr(TMEMBER_PTR(_invObject)); persistMgr->transferPtr(TMEMBER_PTR(_inventoryOwner)); persistMgr->transferBool(TMEMBER(_tempDisableSaveState)); _items.persist(persistMgr); - persistMgr->transfer(TMEMBER(_itemsFile)); + persistMgr->transferCharPtr(TMEMBER(_itemsFile)); _speechDirs.persist(persistMgr); persistMgr->transferBool(TMEMBER(_smartItemCursor)); @@ -1451,7 +1451,7 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) { _initialScene = false; } - persistMgr->transfer(TMEMBER(_startupScene)); + persistMgr->transferCharPtr(TMEMBER(_startupScene)); return STATUS_OK; |