From 95d2ed1a9b97958df609fd2a521ed125db8c2f03 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Tue, 29 Oct 2013 01:40:43 +0100 Subject: WINTERMUTE: Transfer Rect32s explicitly when saving/loading. --- engines/wintermute/ui/ui_tiled_image.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/wintermute/ui/ui_tiled_image.cpp') diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index e647e0d894..29b99f71fc 100644 --- a/engines/wintermute/ui/ui_tiled_image.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -369,16 +369,16 @@ void UITiledImage::correctSize(int32 *width, int32 *height) { bool UITiledImage::persist(BasePersistenceManager *persistMgr) { BaseObject::persist(persistMgr); - persistMgr->transfer(TMEMBER(_downLeft)); - persistMgr->transfer(TMEMBER(_downMiddle)); - persistMgr->transfer(TMEMBER(_downRight)); + persistMgr->transferRect32(TMEMBER(_downLeft)); + persistMgr->transferRect32(TMEMBER(_downMiddle)); + persistMgr->transferRect32(TMEMBER(_downRight)); persistMgr->transferPtr(TMEMBER_PTR(_image)); - persistMgr->transfer(TMEMBER(_middleLeft)); - persistMgr->transfer(TMEMBER(_middleMiddle)); - persistMgr->transfer(TMEMBER(_middleRight)); - persistMgr->transfer(TMEMBER(_upLeft)); - persistMgr->transfer(TMEMBER(_upMiddle)); - persistMgr->transfer(TMEMBER(_upRight)); + persistMgr->transferRect32(TMEMBER(_middleLeft)); + persistMgr->transferRect32(TMEMBER(_middleMiddle)); + persistMgr->transferRect32(TMEMBER(_middleRight)); + persistMgr->transferRect32(TMEMBER(_upLeft)); + persistMgr->transferRect32(TMEMBER(_upMiddle)); + persistMgr->transferRect32(TMEMBER(_upRight)); return STATUS_OK; } -- cgit v1.2.3 From 3fb418390910cfb00d8b3dda8da33b8302615b6a Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Tue, 29 Oct 2013 02:19:00 +0100 Subject: WINTERMUTE: Remove BasePlatform::setRectEmpty (replace with member-call) --- engines/wintermute/ui/ui_tiled_image.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/wintermute/ui/ui_tiled_image.cpp') diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index 29b99f71fc..b7bbbbbbe5 100644 --- a/engines/wintermute/ui/ui_tiled_image.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -44,15 +44,15 @@ IMPLEMENT_PERSISTENT(UITiledImage, false) UITiledImage::UITiledImage(BaseGame *inGame) : BaseObject(inGame) { _image = nullptr; - BasePlatform::setRectEmpty(&_upLeft); - BasePlatform::setRectEmpty(&_upMiddle); - BasePlatform::setRectEmpty(&_upRight); - BasePlatform::setRectEmpty(&_middleLeft); - BasePlatform::setRectEmpty(&_middleMiddle); - BasePlatform::setRectEmpty(&_middleRight); - BasePlatform::setRectEmpty(&_downLeft); - BasePlatform::setRectEmpty(&_downMiddle); - BasePlatform::setRectEmpty(&_downRight); + _upLeft.setEmpty(); + _upMiddle.setEmpty(); + _upRight.setEmpty(); + _middleLeft.setEmpty(); + _middleMiddle.setEmpty(); + _middleRight.setEmpty(); + _downLeft.setEmpty(); + _downMiddle.setEmpty(); + _downRight.setEmpty(); } -- cgit v1.2.3 From efb8031b3c38b8d7e2da73725eb60a35554d0508 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Tue, 29 Oct 2013 02:28:25 +0100 Subject: WINTERMUTE: Remove BasePlatform::isRectEmpty (replace with member-call). --- engines/wintermute/ui/ui_tiled_image.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/wintermute/ui/ui_tiled_image.cpp') diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index b7bbbbbbe5..66fd3f50a7 100644 --- a/engines/wintermute/ui/ui_tiled_image.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -287,33 +287,33 @@ bool UITiledImage::loadBuffer(char *buffer, bool complete) { int width = _image->_surface->getWidth() / 3; int height = _image->_surface->getHeight() / 3; - if (BasePlatform::isRectEmpty(&_upLeft)) { + if (_upLeft.isRectEmpty()) { BasePlatform::setRect(&_upLeft, 0, 0, width, height); } - if (BasePlatform::isRectEmpty(&_upMiddle)) { + if (_upMiddle.isRectEmpty()) { BasePlatform::setRect(&_upMiddle, width, 0, 2 * width, height); } - if (BasePlatform::isRectEmpty(&_upRight)) { + if (_upRight.isRectEmpty()) { BasePlatform::setRect(&_upRight, 2 * width, 0, 3 * width, height); } - if (BasePlatform::isRectEmpty(&_middleLeft)) { + if (_middleLeft.isRectEmpty()) { BasePlatform::setRect(&_middleLeft, 0, height, width, 2 * height); } - if (BasePlatform::isRectEmpty(&_middleMiddle)) { + if (_middleMiddle.isRectEmpty()) { BasePlatform::setRect(&_middleMiddle, width, height, 2 * width, 2 * height); } - if (BasePlatform::isRectEmpty(&_middleRight)) { + if (_middleRight.isRectEmpty()) { BasePlatform::setRect(&_middleRight, 2 * width, height, 3 * width, 2 * height); } - if (BasePlatform::isRectEmpty(&_downLeft)) { + if (_downLeft.isRectEmpty()) { BasePlatform::setRect(&_downLeft, 0, 2 * height, width, 3 * height); } - if (BasePlatform::isRectEmpty(&_downMiddle)) { + if (_downMiddle.isRectEmpty()) { BasePlatform::setRect(&_downMiddle, width, 2 * height, 2 * width, 3 * height); } - if (BasePlatform::isRectEmpty(&_downRight)) { + if (_downRight.isRectEmpty()) { BasePlatform::setRect(&_downRight, 2 * width, 2 * height, 3 * width, 3 * height); } } -- cgit v1.2.3 From d6b9d7de8f4bc8be34ef7456a89ee144172ca5b0 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Tue, 29 Oct 2013 02:55:31 +0100 Subject: WINTERMUTE: Remove BasePlatform::setRect (replace with member-call) --- engines/wintermute/ui/ui_tiled_image.cpp | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'engines/wintermute/ui/ui_tiled_image.cpp') diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index 66fd3f50a7..e895477a36 100644 --- a/engines/wintermute/ui/ui_tiled_image.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -267,19 +267,19 @@ bool UITiledImage::loadBuffer(char *buffer, bool complete) { if (vTiles && hTiles) { // up row - BasePlatform::setRect(&_upLeft, 0, 0, h1, v1); - BasePlatform::setRect(&_upMiddle, h1, 0, h1 + h2, v1); - BasePlatform::setRect(&_upRight, h1 + h2, 0, h1 + h2 + h3, v1); + _upLeft.setRect(0, 0, h1, v1); + _upMiddle.setRect(h1, 0, h1 + h2, v1); + _upRight.setRect(h1 + h2, 0, h1 + h2 + h3, v1); // middle row - BasePlatform::setRect(&_middleLeft, 0, v1, h1, v1 + v2); - BasePlatform::setRect(&_middleMiddle, h1, v1, h1 + h2, v1 + v2); - BasePlatform::setRect(&_middleRight, h1 + h2, v1, h1 + h2 + h3, v1 + v2); + _middleLeft.setRect(0, v1, h1, v1 + v2); + _middleMiddle.setRect(h1, v1, h1 + h2, v1 + v2); + _middleRight.setRect(h1 + h2, v1, h1 + h2 + h3, v1 + v2); // down row - BasePlatform::setRect(&_downLeft, 0, v1 + v2, h1, v1 + v2 + v3); - BasePlatform::setRect(&_downMiddle, h1, v1 + v2, h1 + h2, v1 + v2 + v3); - BasePlatform::setRect(&_downRight, h1 + h2, v1 + v2, h1 + h2 + h3, v1 + v2 + v3); + _downLeft.setRect(0, v1 + v2, h1, v1 + v2 + v3); + _downMiddle.setRect(h1, v1 + v2, h1 + h2, v1 + v2 + v3); + _downRight.setRect(h1 + h2, v1 + v2, h1 + h2 + h3, v1 + v2 + v3); } // default @@ -288,33 +288,33 @@ bool UITiledImage::loadBuffer(char *buffer, bool complete) { int height = _image->_surface->getHeight() / 3; if (_upLeft.isRectEmpty()) { - BasePlatform::setRect(&_upLeft, 0, 0, width, height); + _upLeft.setRect(0, 0, width, height); } if (_upMiddle.isRectEmpty()) { - BasePlatform::setRect(&_upMiddle, width, 0, 2 * width, height); + _upMiddle.setRect(width, 0, 2 * width, height); } if (_upRight.isRectEmpty()) { - BasePlatform::setRect(&_upRight, 2 * width, 0, 3 * width, height); + _upRight.setRect(2 * width, 0, 3 * width, height); } if (_middleLeft.isRectEmpty()) { - BasePlatform::setRect(&_middleLeft, 0, height, width, 2 * height); + _middleLeft.setRect(0, height, width, 2 * height); } if (_middleMiddle.isRectEmpty()) { - BasePlatform::setRect(&_middleMiddle, width, height, 2 * width, 2 * height); + _middleMiddle.setRect(width, height, 2 * width, 2 * height); } if (_middleRight.isRectEmpty()) { - BasePlatform::setRect(&_middleRight, 2 * width, height, 3 * width, 2 * height); + _middleRight.setRect(2 * width, height, 3 * width, 2 * height); } if (_downLeft.isRectEmpty()) { - BasePlatform::setRect(&_downLeft, 0, 2 * height, width, 3 * height); + _downLeft.setRect(0, 2 * height, width, 3 * height); } if (_downMiddle.isRectEmpty()) { - BasePlatform::setRect(&_downMiddle, width, 2 * height, 2 * width, 3 * height); + _downMiddle.setRect(width, 2 * height, 2 * width, 3 * height); } if (_downRight.isRectEmpty()) { - BasePlatform::setRect(&_downRight, 2 * width, 2 * height, 3 * width, 3 * height); + _downRight.setRect(2 * width, 2 * height, 3 * width, 3 * height); } } -- cgit v1.2.3