diff options
| author | Einar Johan Trøan Sømåen | 2013-10-29 01:42:13 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-10-29 02:59:53 +0100 |
| commit | 538c5935f97788090e93f96f6342c6d3c97e0e76 (patch) | |
| tree | b23161c97835e1c5f0813b7d901d159777785c62 | |
| parent | 95d2ed1a9b97958df609fd2a521ed125db8c2f03 (diff) | |
| download | scummvm-rg350-538c5935f97788090e93f96f6342c6d3c97e0e76.tar.gz scummvm-rg350-538c5935f97788090e93f96f6342c6d3c97e0e76.tar.bz2 scummvm-rg350-538c5935f97788090e93f96f6342c6d3c97e0e76.zip | |
WINTERMUTE: Transfer Point32s explicitly when saving/loading.
| -rw-r--r-- | engines/wintermute/ad/ad_sentence.cpp | 2 | ||||
| -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/ui/ui_window.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp index e742ffac35..773181b373 100644 --- a/engines/wintermute/ad/ad_sentence.cpp +++ b/engines/wintermute/ad/ad_sentence.cpp @@ -255,7 +255,7 @@ bool AdSentence::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_currentSkelAnim)); persistMgr->transfer(TMEMBER(_duration)); persistMgr->transferPtr(TMEMBER_PTR(_font)); - persistMgr->transfer(TMEMBER(_pos)); + persistMgr->transferPoint32(TMEMBER(_pos)); persistMgr->transferPtr(TMEMBER_PTR(_sound)); persistMgr->transferBool(TMEMBER(_soundStarted)); persistMgr->transfer(TMEMBER(_stances)); diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index f6bd966113..a5da8c1757 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -813,7 +813,7 @@ bool BasePersistenceManager::transferRect32(const char *name, Rect32 *val) { ////////////////////////////////////////////////////////////////////////// // POINT -bool BasePersistenceManager::transfer(const char *name, Point32 *val) { +bool BasePersistenceManager::transferPoint32(const char *name, Point32 *val) { if (_saving) { _saveStream->writeSint32LE(val->x); _saveStream->writeSint32LE(val->y); diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index bdacafd2f4..3bac07ea9d 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -81,7 +81,7 @@ public: bool transferBool(const char *name, bool *val); bool transferByte(const char *name, byte *val); bool transferRect32(const char *name, Rect32 *val); - bool transfer(const char *name, Point32 *val); + bool transferPoint32(const char *name, Point32 *val); bool transfer(const char *name, const char **val); bool transfer(const char *name, char **val); bool transfer(const char *name, Common::String *val); diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index fab47342df..8101dfd62d 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -1259,7 +1259,7 @@ bool UIWindow::persist(BasePersistenceManager *persistMgr) { persistMgr->transferPtr(TMEMBER_PTR(_backInactive)); persistMgr->transferBool(TMEMBER(_clipContents)); - persistMgr->transfer(TMEMBER(_dragFrom)); + persistMgr->transferPoint32(TMEMBER(_dragFrom)); persistMgr->transferBool(TMEMBER(_dragging)); persistMgr->transferRect32(TMEMBER(_dragRect)); persistMgr->transferBool(TMEMBER(_fadeBackground)); |