diff options
author | Einar Johan Trøan Sømåen | 2013-11-05 13:59:55 +0100 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2013-11-05 13:59:55 +0100 |
commit | cc33cf74aee6f024c4f1f4dec95dea4c72b3139d (patch) | |
tree | 6090466bc89c9580039b62f4235cfc34f58cb15f /engines | |
parent | 4e2bec5311c3f1cad1beb21d5c46539fdc8a7747 (diff) | |
download | scummvm-rg350-cc33cf74aee6f024c4f1f4dec95dea4c72b3139d.tar.gz scummvm-rg350-cc33cf74aee6f024c4f1f4dec95dea4c72b3139d.tar.bz2 scummvm-rg350-cc33cf74aee6f024c4f1f4dec95dea4c72b3139d.zip |
WINTERMUTE: Transfer Common::Strings explicitly when saving/loading.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/wintermute/ad/ad_actor.cpp | 10 | ||||
-rw-r--r-- | engines/wintermute/base/base_persistence_manager.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_persistence_manager.h | 2 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/base_renderer.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/base/sound/base_sound.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/video/video_theora_player.cpp | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp index e440a13d57..33ad39b411 100644 --- a/engines/wintermute/ad/ad_actor.cpp +++ b/engines/wintermute/ad/ad_actor.cpp @@ -1337,11 +1337,11 @@ bool AdActor::persist(BasePersistenceManager *persistMgr) { persistMgr->transferPtr(TMEMBER_PTR(_walkSprite)); persistMgr->transferPtr(TMEMBER_PTR(_animSprite2)); - persistMgr->transfer(TMEMBER(_talkAnimName)); - persistMgr->transfer(TMEMBER(_idleAnimName)); - persistMgr->transfer(TMEMBER(_walkAnimName)); - persistMgr->transfer(TMEMBER(_turnLeftAnimName)); - persistMgr->transfer(TMEMBER(_turnRightAnimName)); + persistMgr->transferString(TMEMBER(_talkAnimName)); + persistMgr->transferString(TMEMBER(_idleAnimName)); + persistMgr->transferString(TMEMBER(_walkAnimName)); + persistMgr->transferString(TMEMBER(_turnLeftAnimName)); + persistMgr->transferString(TMEMBER(_turnRightAnimName)); _anims.persist(persistMgr); diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index 97907dead7..12ac1fff1e 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -716,7 +716,7 @@ bool BasePersistenceManager::transferConstChar(const char *name, const char **va ////////////////////////////////////////////////////////////////////////// // Common::String -bool BasePersistenceManager::transfer(const char *name, Common::String *val) { +bool BasePersistenceManager::transferString(const char *name, Common::String *val) { if (_saving) { putString(val->c_str()); return STATUS_OK; diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 2cb360e4af..3d27fde7e4 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -84,7 +84,7 @@ public: bool transferPoint32(const char *name, Point32 *val); bool transferConstChar(const char *name, const char **val); bool transferCharPtr(const char *name, char **val); - bool transfer(const char *name, Common::String *val); + bool transferString(const char *name, Common::String *val); bool transferVector2(const char *name, Vector2 *val); bool transfer(const char *name, AnsiStringArray &Val); BasePersistenceManager(const char *savePrefix = nullptr, bool deleteSingleton = false); diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp index 6bc27f06f4..858a7fc6dc 100644 --- a/engines/wintermute/base/gfx/base_renderer.cpp +++ b/engines/wintermute/base/gfx/base_renderer.cpp @@ -173,8 +173,8 @@ void BaseRenderer::endSaveLoad() { } void BaseRenderer::persistSaveLoadImages(BasePersistenceManager *persistMgr) { - persistMgr->transfer(TMEMBER(_loadImageName)); - persistMgr->transfer(TMEMBER(_saveImageName)); + persistMgr->transferString(TMEMBER(_loadImageName)); + persistMgr->transferString(TMEMBER(_saveImageName)); persistMgr->transferSint32(TMEMBER(_saveImageX)); persistMgr->transferSint32(TMEMBER(_saveImageY)); persistMgr->transferSint32(TMEMBER(_loadImageX)); diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp index 11408c27c3..f9cd59e4fb 100644 --- a/engines/wintermute/base/sound/base_sound.cpp +++ b/engines/wintermute/base/sound/base_sound.cpp @@ -166,7 +166,7 @@ bool BaseSound::persist(BasePersistenceManager *persistMgr) { persistMgr->transferPtr(TMEMBER_PTR(_gameRef)); - persistMgr->transfer(TMEMBER(_soundFilename)); + persistMgr->transferString(TMEMBER(_soundFilename)); persistMgr->transferBool(TMEMBER(_soundLooping)); persistMgr->transferBool(TMEMBER(_soundPaused)); persistMgr->transferBool(TMEMBER(_soundFreezePaused)); diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp index d27ca5a1ed..44eecf93a8 100644 --- a/engines/wintermute/video/video_theora_player.cpp +++ b/engines/wintermute/video/video_theora_player.cpp @@ -493,8 +493,8 @@ bool VideoTheoraPlayer::persist(BasePersistenceManager *persistMgr) { persistMgr->transferPtr(TMEMBER_PTR(_gameRef)); persistMgr->transferUint32(TMEMBER(_savedPos)); persistMgr->transferSint32(TMEMBER(_savedState)); - persistMgr->transfer(TMEMBER(_filename)); - persistMgr->transfer(TMEMBER(_alphaFilename)); + persistMgr->transferString(TMEMBER(_filename)); + persistMgr->transferString(TMEMBER(_alphaFilename)); persistMgr->transferSint32(TMEMBER(_posX)); persistMgr->transferSint32(TMEMBER(_posY)); persistMgr->transferFloat(TMEMBER(_playZoom)); |