[Scummvm-git-logs] scummvm master -> 0ca054599d5dffc851f0051b18ebb4952245f51a

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0ca054599d WINTERMUTE: WME3D: Restore constructor initialisers and moved code, matching original


Commit: 0ca054599d5dffc851f0051b18ebb4952245f51a
    https://github.com/scummvm/scummvm/commit/0ca054599d5dffc851f0051b18ebb4952245f51a
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-06-26T00:25:43+02:00

Commit Message:
WINTERMUTE: WME3D: Restore constructor initialisers and moved code, matching original

Changed paths:
    engines/wintermute/base/base_active_rect.cpp


diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp
index 173a7565663..8c73127e2c8 100644
--- a/engines/wintermute/base/base_active_rect.cpp
+++ b/engines/wintermute/base/base_active_rect.cpp
@@ -58,14 +58,29 @@ BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseSubFrame
 	_zoomX = zoomX;
 	_zoomY = zoomY;
 	_precise = precise;
+#ifdef ENABLE_WME3D
+	_modelX = nullptr;
+#endif
 	_region = nullptr;
 	_offsetX = _offsetY = 0;
 	clipRect();
+}
 
+//////////////////////////////////////////////////////////////////////
 #ifdef ENABLE_WME3D
-	_modelX = nullptr;
-#endif
+BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, ModelX *model, int x, int y, int width, int height, bool precise) : BaseClass(inGame) {
+	_owner = owner;
+	_modelX = model;
+	_rect.setRect(x, y, x + width, y + height);
+	_zoomX = 100;
+	_zoomY = 100;
+	_precise = precise;
+	_frame = nullptr;
+	_region = nullptr;
+	_offsetX = _offsetY = 0;
+	clipRect();
 }
+#endif
 
 //////////////////////////////////////////////////////////////////////
 BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseRegion *region, int offsetX, int offsetY) : BaseClass(inGame) {
@@ -77,31 +92,21 @@ BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseRegion *
 	_zoomY = 100;
 	_precise = true;
 	_frame = nullptr;
-	clipRect();
-	_offsetX = offsetX;
-	_offsetY = offsetY;
-
 #ifdef ENABLE_WME3D
 	_modelX = nullptr;
 #endif
+	clipRect();
+	_offsetX = offsetX;
+	_offsetY = offsetY;
 }
 
-#ifdef ENABLE_WME3D
-BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, ModelX *model, int x, int y, int width, int height, bool precise)
-	: BaseClass(inGame) {
-	_frame = nullptr;
-	_region = nullptr;
-	_owner = owner;
-	_modelX = model;
-	_rect.setRect(x, y, x + width, y + height);
-	_precise = precise;
-}
-#endif
-
 //////////////////////////////////////////////////////////////////////
 BaseActiveRect::~BaseActiveRect() {
 	_owner = nullptr;
 	_frame = nullptr;
+#ifdef ENABLE_WME3D
+	_modelX = nullptr;
+#endif
 	_region = nullptr;
 }