WINTERMUTE: Transfer Rect32s explicitly when saving/loading.

12 files changed, 21 insertions, 21 deletions

diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 61e392939f..a6e10fee9c 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -374,7 +374,7 @@ bool AdInventoryBox::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_closeButton));
 	persistMgr->transferBool(TMEMBER(_hideSelected));
 	persistMgr->transfer(TMEMBER(_itemHeight));
-	persistMgr->transfer(TMEMBER(_itemsArea));
+	persistMgr->transferRect32(TMEMBER(_itemsArea));
 	persistMgr->transfer(TMEMBER(_itemWidth));
 	persistMgr->transfer(TMEMBER(_scrollBy));
 	persistMgr->transfer(TMEMBER(_scrollOffset));
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 7ad3380336..9058717c34 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -587,7 +587,7 @@ bool AdResponseBox::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_lastResponseText));
 	persistMgr->transfer(TMEMBER(_lastResponseTextOrig));
 	_respButtons.persist(persistMgr);
-	persistMgr->transfer(TMEMBER(_responseArea));
+	persistMgr->transferRect32(TMEMBER(_responseArea));
 	_responses.persist(persistMgr);
 	persistMgr->transfer(TMEMBER(_scrollOffset));
 	persistMgr->transferPtr(TMEMBER_PTR(_shieldWindow));
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 04a52caa85..f8da28c4c6 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -3099,7 +3099,7 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_soundBufferSizeSec));
 	persistMgr->transferBool(TMEMBER(_suspendedRendering));
 
-	persistMgr->transfer(TMEMBER(_mouseLockRect));
+	persistMgr->transferRect32(TMEMBER(_mouseLockRect));
 
 	_windows.persist(persistMgr);
 
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index 70b2c6a07d..ffc598471a 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -975,7 +975,7 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_sFXStart));
 	persistMgr->transfer(TMEMBER(_sFXVolume));
 	persistMgr->transferBool(TMEMBER(_ready));
-	persistMgr->transfer(TMEMBER(_rect));
+	persistMgr->transferRect32(TMEMBER(_rect));
 	persistMgr->transferBool(TMEMBER(_rectSet));
 	persistMgr->transferBool(TMEMBER(_registrable));
 	persistMgr->transferBool(TMEMBER(_shadowable));
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 766e381422..f6bd966113 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -788,7 +788,7 @@ bool BasePersistenceManager::transferByte(const char *name, byte *val) {
 
 //////////////////////////////////////////////////////////////////////////
 // RECT
-bool BasePersistenceManager::transfer(const char *name, Rect32 *val) {
+bool BasePersistenceManager::transferRect32(const char *name, Rect32 *val) {
 	if (_saving) {
 		_saveStream->writeSint32LE(val->left);
 		_saveStream->writeSint32LE(val->top);
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index d1569fccf6..bdacafd2f4 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -80,7 +80,7 @@ public:
 	bool transfer(const char *name, double *val);
 	bool transferBool(const char *name, bool *val);
 	bool transferByte(const char *name, byte *val);
-	bool transfer(const char *name, Rect32 *val);
+	bool transferRect32(const char *name, Rect32 *val);
 	bool transfer(const char *name, Point32 *val);
 	bool transfer(const char *name, const char **val);
 	bool transfer(const char *name, char **val);
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index be85616250..72af5fb076 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -393,7 +393,7 @@ bool BaseSubFrame::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_editorSelected));
 	persistMgr->transfer(TMEMBER(_hotspotX));
 	persistMgr->transfer(TMEMBER(_hotspotY));
-	persistMgr->transfer(TMEMBER(_rect));
+	persistMgr->transferRect32(TMEMBER(_rect));
 	persistMgr->transferBool(TMEMBER(_wantsDefaultRect));
 
 	persistMgr->transfer(TMEMBER(_surfaceFilename));
diff --git a/engines/wintermute/base/base_viewport.cpp b/engines/wintermute/base/base_viewport.cpp
index 09ac80e9de..7e531e839a 100644
--- a/engines/wintermute/base/base_viewport.cpp
+++ b/engines/wintermute/base/base_viewport.cpp
@@ -58,7 +58,7 @@ bool BaseViewport::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_mainObject));
 	persistMgr->transfer(TMEMBER(_offsetX));
 	persistMgr->transfer(TMEMBER(_offsetY));
-	persistMgr->transfer(TMEMBER(_rect));
+	persistMgr->transferRect32(TMEMBER(_rect));
 
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 79076d78b6..4a1095c5c1 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -1183,7 +1183,7 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_running));
 	persistMgr->transfer(TMEMBER(_overheadTime));
 
-	persistMgr->transfer(TMEMBER(_border));
+	persistMgr->transferRect32(TMEMBER(_border));
 	persistMgr->transfer(TMEMBER(_borderThicknessLeft));
 	persistMgr->transfer(TMEMBER(_borderThicknessRight));
 	persistMgr->transfer(TMEMBER(_borderThicknessTop));
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index c35ebd6f50..f4cd61c078 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -232,7 +232,7 @@ bool PartParticle::fadeOut(uint32 currentTime, int fadeTime) {
 bool PartParticle::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_alpha1));
 	persistMgr->transfer(TMEMBER(_alpha2));
-	persistMgr->transfer(TMEMBER(_border));
+	persistMgr->transferRect32(TMEMBER(_border));
 	persistMgr->transferVector2(TMEMBER(_pos));
 	persistMgr->transferFloat(TMEMBER(_posZ));
 	persistMgr->transferVector2(TMEMBER(_velocity));
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;
 }
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 7883b659eb..fab47342df 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -1261,7 +1261,7 @@ bool UIWindow::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_clipContents));
 	persistMgr->transfer(TMEMBER(_dragFrom));
 	persistMgr->transferBool(TMEMBER(_dragging));
-	persistMgr->transfer(TMEMBER(_dragRect));
+	persistMgr->transferRect32(TMEMBER(_dragRect));
 	persistMgr->transferBool(TMEMBER(_fadeBackground));
 	persistMgr->transfer(TMEMBER(_fadeColor));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontInactive));
@@ -1272,7 +1272,7 @@ bool UIWindow::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_shieldButton));
 	persistMgr->transferPtr(TMEMBER_PTR(_shieldWindow));
 	persistMgr->transfer(TMEMBER_INT(_titleAlign));
-	persistMgr->transfer(TMEMBER(_titleRect));
+	persistMgr->transferRect32(TMEMBER(_titleRect));
 	persistMgr->transferBool(TMEMBER(_transparent));
 	persistMgr->transferPtr(TMEMBER_PTR(_viewport));
 	persistMgr->transferBool(TMEMBER(_pauseMusic));