diff options
| author | Einar Johan Trøan Sømåen | 2013-11-05 13:48:11 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-11-05 13:48:11 +0100 |
| commit | d07409def7cf63296a11f0cdea3bf5b7e1c3427a (patch) | |
| tree | b78e3e6532d34ca7be65d489fea09fcc96583d72 /engines/wintermute/ui | |
| parent | 7892188bcf45ec7eaeee9eed1c92b84839c1224b (diff) | |
| download | scummvm-rg350-d07409def7cf63296a11f0cdea3bf5b7e1c3427a.tar.gz scummvm-rg350-d07409def7cf63296a11f0cdea3bf5b7e1c3427a.tar.bz2 scummvm-rg350-d07409def7cf63296a11f0cdea3bf5b7e1c3427a.zip | |
WINTERMUTE: Transfer Sint32s explicitly when saving/loading.
Diffstat (limited to 'engines/wintermute/ui')
| -rw-r--r-- | engines/wintermute/ui/ui_button.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_edit.cpp | 10 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_object.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_text.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_window.cpp | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp index 3cc33f2362..7526174b64 100644 --- a/engines/wintermute/ui/ui_button.cpp +++ b/engines/wintermute/ui/ui_button.cpp @@ -1178,7 +1178,7 @@ bool UIButton::persist(BasePersistenceManager *persistMgr) { UIObject::persist(persistMgr); - persistMgr->transfer(TMEMBER_INT(_align)); + persistMgr->transferSint32(TMEMBER_INT(_align)); persistMgr->transferPtr(TMEMBER_PTR(_backDisable)); persistMgr->transferPtr(TMEMBER_PTR(_backFocus)); persistMgr->transferPtr(TMEMBER_PTR(_backHover)); diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp index 5608bccd46..8df33f1382 100644 --- a/engines/wintermute/ui/ui_edit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -935,11 +935,11 @@ bool UIEdit::persist(BasePersistenceManager *persistMgr) { persistMgr->transferUint32(TMEMBER(_cursorBlinkRate)); persistMgr->transfer(TMEMBER(_cursorChar)); persistMgr->transferPtr(TMEMBER_PTR(_fontSelected)); - persistMgr->transfer(TMEMBER(_frameWidth)); - persistMgr->transfer(TMEMBER(_maxLength)); - persistMgr->transfer(TMEMBER(_scrollOffset)); - persistMgr->transfer(TMEMBER(_selEnd)); - persistMgr->transfer(TMEMBER(_selStart)); + persistMgr->transferSint32(TMEMBER(_frameWidth)); + persistMgr->transferSint32(TMEMBER(_maxLength)); + persistMgr->transferSint32(TMEMBER(_scrollOffset)); + persistMgr->transferSint32(TMEMBER(_selEnd)); + persistMgr->transferSint32(TMEMBER(_selStart)); if (!persistMgr->getIsSaving()) { _cursorVisible = false; diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp index 8dfd95f9f9..27fc91c03e 100644 --- a/engines/wintermute/ui/ui_object.cpp +++ b/engines/wintermute/ui/ui_object.cpp @@ -626,7 +626,7 @@ bool UIObject::persist(BasePersistenceManager *persistMgr) { persistMgr->transferBool(TMEMBER(_disable)); persistMgr->transferPtr(TMEMBER_PTR(_focusedWidget)); persistMgr->transferPtr(TMEMBER_PTR(_font)); - persistMgr->transfer(TMEMBER(_height)); + persistMgr->transferSint32(TMEMBER(_height)); persistMgr->transferPtr(TMEMBER_PTR(_image)); persistMgr->transferPtr(TMEMBER_PTR(_listenerObject)); persistMgr->transferPtr(TMEMBER_PTR(_listenerParamObject)); @@ -636,9 +636,9 @@ bool UIObject::persist(BasePersistenceManager *persistMgr) { persistMgr->transferBool(TMEMBER(_sharedFonts)); persistMgr->transferBool(TMEMBER(_sharedImages)); persistMgr->transfer(TMEMBER(_text)); - persistMgr->transfer(TMEMBER_INT(_type)); + persistMgr->transferSint32(TMEMBER_INT(_type)); persistMgr->transferBool(TMEMBER(_visible)); - persistMgr->transfer(TMEMBER(_width)); + persistMgr->transferSint32(TMEMBER(_width)); return STATUS_OK; } diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp index 117b1ff6cf..b255e6e790 100644 --- a/engines/wintermute/ui/ui_text.cpp +++ b/engines/wintermute/ui/ui_text.cpp @@ -503,8 +503,8 @@ const char *UIText::scToString() { bool UIText::persist(BasePersistenceManager *persistMgr) { UIObject::persist(persistMgr); - persistMgr->transfer(TMEMBER_INT(_textAlign)); - persistMgr->transfer(TMEMBER_INT(_verticalAlign)); + persistMgr->transferSint32(TMEMBER_INT(_textAlign)); + persistMgr->transferSint32(TMEMBER_INT(_verticalAlign)); return STATUS_OK; } diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index 2aaa3fd1b0..842bf700b5 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -1268,10 +1268,10 @@ bool UIWindow::persist(BasePersistenceManager *persistMgr) { persistMgr->transferPtr(TMEMBER_PTR(_imageInactive)); persistMgr->transferBool(TMEMBER(_inGame)); persistMgr->transferBool(TMEMBER(_isMenu)); - persistMgr->transfer(TMEMBER_INT(_mode)); + persistMgr->transferSint32(TMEMBER_INT(_mode)); persistMgr->transferPtr(TMEMBER_PTR(_shieldButton)); persistMgr->transferPtr(TMEMBER_PTR(_shieldWindow)); - persistMgr->transfer(TMEMBER_INT(_titleAlign)); + persistMgr->transferSint32(TMEMBER_INT(_titleAlign)); persistMgr->transferRect32(TMEMBER(_titleRect)); persistMgr->transferBool(TMEMBER(_transparent)); persistMgr->transferPtr(TMEMBER_PTR(_viewport)); |