diff options
| author | Einar Johan Trøan Sømåen | 2013-04-19 17:16:57 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-19 17:17:53 +0200 |
| commit | 72d0affe014026125168f1a6785ef0f57447c6df (patch) | |
| tree | 6baea0011df938d2cdd34ce64945093d0e27c64f /engines/wintermute/base/base_game.cpp | |
| parent | 60a474d452440ea7ea736cc95d92a1561fc50442 (diff) | |
| download | scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.tar.gz scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.tar.bz2 scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.zip | |
WINTERMUTE: Rename transfer(void *) to transferPtr(void *) to avoid overload-misses.
Diffstat (limited to 'engines/wintermute/base/base_game.cpp')
| -rw-r--r-- | engines/wintermute/base/base_game.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index 0f2a3d1260..aaa6c90e9b 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -3055,18 +3055,18 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) { BaseObject::persist(persistMgr); - persistMgr->transfer(TMEMBER(_activeObject)); - persistMgr->transfer(TMEMBER(_capturedObject)); - persistMgr->transfer(TMEMBER(_cursorNoninteractive)); + persistMgr->transferPtr(TMEMBER_PTR(_activeObject)); + persistMgr->transferPtr(TMEMBER_PTR(_capturedObject)); + persistMgr->transferPtr(TMEMBER_PTR(_cursorNoninteractive)); persistMgr->transfer(TMEMBER(_editorMode)); - persistMgr->transfer(TMEMBER(_fader)); + persistMgr->transferPtr(TMEMBER_PTR(_fader)); persistMgr->transfer(TMEMBER(_freezeLevel)); - persistMgr->transfer(TMEMBER(_focusedWindow)); - persistMgr->transfer(TMEMBER(_fontStorage)); + persistMgr->transferPtr(TMEMBER_PTR(_focusedWindow)); + persistMgr->transferPtr(TMEMBER_PTR(_fontStorage)); persistMgr->transfer(TMEMBER(_interactive)); - persistMgr->transfer(TMEMBER(_keyboardState)); + persistMgr->transferPtr(TMEMBER_PTR(_keyboardState)); persistMgr->transfer(TMEMBER(_lastTime)); - persistMgr->transfer(TMEMBER(_mainObject)); + persistMgr->transferPtr(TMEMBER_PTR(_mainObject)); _musicSystem->persistChannels(persistMgr); _musicSystem->persistCrossfadeSettings(persistMgr); @@ -3082,14 +3082,14 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) { _regObjects.persist(persistMgr); - persistMgr->transfer(TMEMBER(_scEngine)); + persistMgr->transferPtr(TMEMBER_PTR(_scEngine)); //persistMgr->transfer(TMEMBER(_soundMgr)); persistMgr->transfer(TMEMBER_INT(_state)); //persistMgr->transfer(TMEMBER(_surfaceStorage)); persistMgr->transfer(TMEMBER(_subtitles)); persistMgr->transfer(TMEMBER(_subtitlesSpeed)); - persistMgr->transfer(TMEMBER(_systemFont)); - persistMgr->transfer(TMEMBER(_videoFont)); + persistMgr->transferPtr(TMEMBER_PTR(_systemFont)); + persistMgr->transferPtr(TMEMBER_PTR(_videoFont)); persistMgr->transfer(TMEMBER(_videoSubtitles)); _timerNormal.persist(persistMgr); |