[Scummvm-git-logs] scummvm master -> 08793b25b7e9ee5eb7c0d705a74d10f456cac760

aquadran noreply at scummvm.org
Mon Sep 1 04:59:58 UTC 2025 

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

Summary:
08793b25b7 WINTERMUTE: Switch to Common::Rect32 and Common::Point32


Commit: 08793b25b7e9ee5eb7c0d705a74d10f456cac760
    https://github.com/scummvm/scummvm/commit/08793b25b7e9ee5eb7c0d705a74d10f456cac760
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-01T06:59:53+02:00

Commit Message:
WINTERMUTE: Switch to Common::Rect32 and Common::Point32

Changed paths:
  R engines/wintermute/math/rect32.h
    engines/wintermute/ad/ad_game.cpp
    engines/wintermute/ad/ad_game.h
    engines/wintermute/ad/ad_inventory_box.cpp
    engines/wintermute/ad/ad_inventory_box.h
    engines/wintermute/ad/ad_item.cpp
    engines/wintermute/ad/ad_response_box.cpp
    engines/wintermute/ad/ad_response_box.h
    engines/wintermute/ad/ad_scene.cpp
    engines/wintermute/ad/ad_scene_geometry.cpp
    engines/wintermute/ad/ad_scene_geometry.h
    engines/wintermute/ad/ad_sentence.h
    engines/wintermute/base/base_active_rect.cpp
    engines/wintermute/base/base_active_rect.h
    engines/wintermute/base/base_frame.cpp
    engines/wintermute/base/base_frame.h
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/base_game.h
    engines/wintermute/base/base_object.h
    engines/wintermute/base/base_persistence_manager.cpp
    engines/wintermute/base/base_persistence_manager.h
    engines/wintermute/base/base_region.cpp
    engines/wintermute/base/base_region.h
    engines/wintermute/base/base_sprite.cpp
    engines/wintermute/base/base_sprite.h
    engines/wintermute/base/base_sub_frame.cpp
    engines/wintermute/base/base_sub_frame.h
    engines/wintermute/base/base_viewport.cpp
    engines/wintermute/base/base_viewport.h
    engines/wintermute/base/font/base_font_bitmap.cpp
    engines/wintermute/base/font/base_font_truetype.cpp
    engines/wintermute/base/gfx/base_renderer.cpp
    engines/wintermute/base/gfx/base_renderer.h
    engines/wintermute/base/gfx/base_surface.cpp
    engines/wintermute/base/gfx/base_surface.h
    engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
    engines/wintermute/base/gfx/osystem/base_render_osystem.h
    engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
    engines/wintermute/base/gfx/osystem/base_surface_osystem.h
    engines/wintermute/base/gfx/xmath.h
    engines/wintermute/base/particles/part_emitter.h
    engines/wintermute/base/particles/part_particle.cpp
    engines/wintermute/base/particles/part_particle.h
    engines/wintermute/ext/wme_vlink.cpp
    engines/wintermute/platform_osystem.cpp
    engines/wintermute/platform_osystem.h
    engines/wintermute/ui/ui_button.cpp
    engines/wintermute/ui/ui_object.cpp
    engines/wintermute/ui/ui_tiled_image.h
    engines/wintermute/ui/ui_window.cpp
    engines/wintermute/ui/ui_window.h
    engines/wintermute/utils/utils.h
    engines/wintermute/video/video_player.cpp
    engines/wintermute/video/video_theora_player.cpp


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 567f7237d56..ac8b4ff58f3 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -1458,7 +1458,7 @@ bool AdGame::loadBuffer(char *buffer, bool complete) {
 					break;
 
 				case TOKEN_SCENE_VIEWPORT: {
-					Rect32 rc;
+					Common::Rect32 rc;
 					parser.scanStr(params2, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
 					if (!_sceneViewport) {
 						_sceneViewport = new BaseViewport(_gameRef);
@@ -1633,7 +1633,7 @@ bool AdGame::handleCustomActionStart(BaseGameCustomAction action) {
 
 	BaseArray<AdObject *> objects;
 
-	Point32 p;
+	Common::Point32 p;
 	int distance = xCenter * xCenter + yCenter * yCenter;
 
 	switch (action) {
@@ -2104,7 +2104,7 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) {
 		if (doUpdate)
 			_gameRef->pluginEvents().applyEvent(WME_EVENT_UPDATE, nullptr);
 
-		Point32 p;
+		Common::Point32 p;
 		getMousePos(&p);
 
 		_scene->update();
@@ -2366,7 +2366,7 @@ bool AdGame::renderShadowGeometry() {
 
 //////////////////////////////////////////////////////////////////////////
 bool AdGame::validMouse() {
-	Point32 pos;
+	Common::Point32 pos;
 	BasePlatform::getCursorPos(&pos);
 
 	return _renderer->pointInViewport(&pos);
@@ -2528,7 +2528,7 @@ Wintermute::TShadowType AdGame::getMaxShadowType(Wintermute::BaseObject *object)
 #endif
 
 //////////////////////////////////////////////////////////////////////////
-bool AdGame::getLayerSize(int *layerWidth, int *layerHeight, Rect32 *viewport, bool *customViewport) {
+bool AdGame::getLayerSize(int *layerWidth, int *layerHeight, Common::Rect32 *viewport, bool *customViewport) {
 	if (_scene && _scene->_mainLayer) {
 		int32 portX, portY, portWidth, portHeight;
 		_scene->getViewportOffset(&portX, &portY);
diff --git a/engines/wintermute/ad/ad_game.h b/engines/wintermute/ad/ad_game.h
index 42a367c8a69..6bcb36782da 100644
--- a/engines/wintermute/ad/ad_game.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -56,7 +56,7 @@ public:
 
 	bool displayDebugInfo() override;
 
-	virtual bool getLayerSize(int *layerWidth, int *layerHeight, Rect32 *viewport, bool *customViewport) override;
+	virtual bool getLayerSize(int *layerWidth, int *layerHeight, Common::Rect32 *viewport, bool *customViewport) override;
 
 #ifdef ENABLE_WME3D
 	uint32 getAmbientLightColor() override;
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 51404773fbd..33efdf80baf 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -127,7 +127,7 @@ bool AdInventoryBox::display() {
 
 
 	// display window
-	Rect32 rect = _itemsArea;
+	Common::Rect32 rect = _itemsArea;
 	if (_window) {
 		BasePlatform::offsetRect(&rect, _window->_posX, _window->_posY);
 		_window->display();
diff --git a/engines/wintermute/ad/ad_inventory_box.h b/engines/wintermute/ad/ad_inventory_box.h
index 2fe4ad935a8..e2364d62948 100644
--- a/engines/wintermute/ad/ad_inventory_box.h
+++ b/engines/wintermute/ad/ad_inventory_box.h
@@ -48,7 +48,7 @@ public:
 	UIButton *_closeButton;
 	int32 _spacing;
 	int32 _scrollOffset;
-	Rect32 _itemsArea;
+	Common::Rect32 _itemsArea;
 	bool listen(BaseScriptHolder *param1, uint32 param2) override;
 	UIWindow *_window;
 	AdInventoryBox(BaseGame *inGame);
diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index 06aa617147c..8e6a93afa70 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -414,7 +414,7 @@ bool AdItem::update() {
 bool AdItem::display(int x, int y) {
 	int width = 0;
 	if (_currentSprite) {
-		Rect32 rc;
+		Common::Rect32 rc;
 		_currentSprite->getBoundingRect(&rc, 0, 0);
 		width = rc.width();
 	}
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 790f019753b..9c103203252 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -446,7 +446,7 @@ bool AdResponseBox::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 
 //////////////////////////////////////////////////////////////////////////
 bool AdResponseBox::display() {
-	Rect32 rect = _responseArea;
+	Common::Rect32 rect = _responseArea;
 	if (_window) {
 		BasePlatform::offsetRect(&rect, _window->_posX, _window->_posY);
 		//_window->display();
diff --git a/engines/wintermute/ad/ad_response_box.h b/engines/wintermute/ad/ad_response_box.h
index 7597eeefc15..b92e10dcecd 100644
--- a/engines/wintermute/ad/ad_response_box.h
+++ b/engines/wintermute/ad/ad_response_box.h
@@ -73,7 +73,7 @@ public:
 	UIWindow *_window;
 	UIWindow *_shieldWindow;
 	bool _horizontal;
-	Rect32 _responseArea;
+	Common::Rect32 _responseArea;
 	int32 _verticalAlign;
 	TTextAlign _align;
 	bool loadFile(const char *filename);
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 328d55e1d1b..869ccb1a39b 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -945,7 +945,7 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
 			break;
 
 		case TOKEN_VIEWPORT: {
-			Rect32 rc;
+			Common::Rect32 rc;
 			parser.scanStr(params, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
 			if (!_viewport) {
 				_viewport = new BaseViewport(_gameRef);
@@ -2855,7 +2855,7 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 
 	// viewport
 	if (_viewport) {
-		Rect32 *rc = _viewport->getRect();
+		Common::Rect32 *rc = _viewport->getRect();
 		buffer->putTextIndent(indent + 2, "VIEWPORT { %d, %d, %d, %d }\n", rc->left, rc->top, rc->right, rc->bottom);
 	}
 
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
index 803bc008ee2..41f4bdf6c5f 100644
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -428,7 +428,7 @@ bool AdSceneGeometry::storeDrawingParams() {
 		_lastScrollY = 0;
 	}
 
-	Rect32 rc;
+	Common::Rect32 rc;
 	_gameRef->getCurrentViewportRect(&rc);
 	float width = (float)rc.right - (float)rc.left;
 	float height = (float)rc.bottom - (float)rc.top;
diff --git a/engines/wintermute/ad/ad_scene_geometry.h b/engines/wintermute/ad/ad_scene_geometry.h
index 4c2e4786ccc..44f7ff03387 100644
--- a/engines/wintermute/ad/ad_scene_geometry.h
+++ b/engines/wintermute/ad/ad_scene_geometry.h
@@ -29,7 +29,6 @@
 #define WINTERMUTE_AD_SCENE_GEOMETRY_H
 
 #include "engines/wintermute/base/base_object.h"
-#include "engines/wintermute/math/rect32.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_sentence.h b/engines/wintermute/ad/ad_sentence.h
index e18936764c7..94a498a9a43 100644
--- a/engines/wintermute/ad/ad_sentence.h
+++ b/engines/wintermute/ad/ad_sentence.h
@@ -31,7 +31,6 @@
 
 #include "engines/wintermute/base/base.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 #include "common/rect.h"
 
@@ -56,7 +55,7 @@ public:
 	TTextAlign _align;
 	bool display();
 	int32 _width;
-	Point32 _pos;
+	Common::Point32 _pos;
 	BaseFont *_font;
 	char *getNextStance();
 	char *getCurrentStance();
diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp
index 3c5c50bda0e..44996721ac8 100644
--- a/engines/wintermute/base/base_active_rect.cpp
+++ b/engines/wintermute/base/base_active_rect.cpp
@@ -113,7 +113,7 @@ BaseActiveRect::~BaseActiveRect() {
 
 //////////////////////////////////////////////////////////////////////////
 void BaseActiveRect::clipRect() {
-	Rect32 rc;
+	Common::Rect32 rc;
 	bool customViewport;
 	_gameRef->getCurrentViewportRect(&rc, &customViewport);
 	BaseRenderer *rend = BaseEngine::getRenderer();
diff --git a/engines/wintermute/base/base_active_rect.h b/engines/wintermute/base/base_active_rect.h
index f23d76e6e48..767d1137869 100644
--- a/engines/wintermute/base/base_active_rect.h
+++ b/engines/wintermute/base/base_active_rect.h
@@ -28,7 +28,7 @@
 #ifndef WINTERMUTE_BASE_ACTIVE_RECT_H
 #define WINTERMUTE_BASE_ACTIVE_RECT_H
 
-#include "engines/wintermute/math/rect32.h"
+#include "common/rect.h"
 #include "engines/wintermute/base/base.h"
 
 namespace Wintermute {
@@ -52,7 +52,7 @@ public:
 	BaseRegion *_region;
 	int32 _offsetX;
 	int32 _offsetY;
-	Rect32 _rect;
+	Common::Rect32 _rect;
 	BaseActiveRect(BaseGame *inGameOwner = nullptr);
 	BaseActiveRect(BaseGame *inGameOwner, BaseObject *owner, BaseSubFrame *frame, int x, int y, int width, int height, float zoomX = 100, float zoomY = 100, bool precise = true);
 	BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseRegion *region, int offsetX, int offsetY);
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index c20a8dcaef1..758364614d5 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -168,7 +168,7 @@ bool BaseFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) {
 	char *params;
 	int cmd;
 	BaseParser parser;
-	Rect32 rect;
+	Common::Rect32 rect;
 	int r = 255, g = 255, b = 255;
 	int ar = 255, ag = 255, ab = 255, alpha = 255;
 	int hotspotX = 0, hotspotY = 0;
@@ -350,13 +350,13 @@ bool BaseFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseFrame::getBoundingRect(Rect32 *rect, int x, int y, float scaleX, float scaleY) {
+bool BaseFrame::getBoundingRect(Common::Rect32 *rect, int x, int y, float scaleX, float scaleY) {
 	if (!rect) {
 		return false;
 	}
 	BasePlatform::setRectEmpty(rect);
 
-	Rect32 subRect;
+	Common::Rect32 subRect;
 
 	for (int32 i = 0; i < _subframes.getSize(); i++) {
 		_subframes[i]->getBoundingRect(&subRect, x, y, scaleX, scaleY);
diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h
index 28c05b6a289..b6eb1bdf172 100644
--- a/engines/wintermute/base/base_frame.h
+++ b/engines/wintermute/base/base_frame.h
@@ -46,7 +46,7 @@ public:
 	DECLARE_PERSISTENT(BaseFrame, BaseScriptable)
 	BaseSound *_sound;
 	bool _editorExpanded;
-	bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100);
+	bool getBoundingRect(Common::Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100);
 	bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 	int32 _moveY;
 	int32 _moveX;
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index c16350bddc6..517da26d01c 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -1264,7 +1264,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 		x = MIN(x, _renderer->getWidth());
 		y = MAX<int32>(y, 0);
 		y = MIN(y, _renderer->getHeight());
-		Point32 p;
+		Common::Point32 p;
 		p.x = x + _renderer->_drawOffsetX;
 		p.y = y + _renderer->_drawOffsetY;
 
@@ -4210,7 +4210,7 @@ bool BaseGame::popViewport() {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseGame::getCurrentViewportRect(Rect32 *rect, bool *custom) const {
+bool BaseGame::getCurrentViewportRect(Common::Rect32 *rect, bool *custom) const {
 	if (rect == nullptr) {
 		return STATUS_FAILED;
 	} else {
@@ -4427,7 +4427,7 @@ bool BaseGame::onActivate(bool activate, bool refreshMouse) {
 	_renderer->_active = activate;
 
 	if (refreshMouse) {
-		Point32 p;
+		Common::Point32 p;
 		getMousePos(&p);
 		setActiveObject(_renderer->getObjectAt(p.x, p.y));
 	}
@@ -4681,7 +4681,7 @@ TShadowType BaseGame::getMaxShadowType(BaseObject *object) {
 #endif
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseGame::getLayerSize(int *layerWidth, int *layerHeight, Rect32 *viewport, bool *customViewport) {
+bool BaseGame::getLayerSize(int *layerWidth, int *layerHeight, Common::Rect32 *viewport, bool *customViewport) {
 	if (_renderer) {
 		*layerWidth = _renderer->getWidth();
 		*layerHeight = _renderer->getHeight();
@@ -4700,7 +4700,7 @@ uint32 BaseGame::getAmbientLightColor() {
 #endif
 
 //////////////////////////////////////////////////////////////////////////
-void BaseGame::getMousePos(Point32 *pos) {
+void BaseGame::getMousePos(Common::Point32 *pos) {
 	BasePlatform::getCursorPos(pos);
 
 	pos->x -= _renderer->_drawOffsetX;
@@ -4727,7 +4727,7 @@ void BaseGame::getMousePos(Point32 *pos) {
 			pos->x = MIN(_mouseLockRect.right, pos->x);
 			pos->y = MIN(_mouseLockRect.bottom, pos->y);
 
-			Point32 newPos = *pos;
+			Common::Point32 newPos = *pos;
 
 			newPos.x += _renderer->_drawOffsetX;
 			newPos.y += _renderer->_drawOffsetY;
@@ -4777,7 +4777,7 @@ bool BaseGame::isDoubleClick(int32 buttonIndex) {
 	int maxMoveX = 4;
 	int maxMoveY = 4;
 
-	Point32 pos;
+	Common::Point32 pos;
 	BasePlatform::getCursorPos(&pos);
 
 	int moveX = abs(pos.x - _lastClick[buttonIndex].posX);
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index bdc6639c201..e0868c3548d 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -34,7 +34,6 @@
 #include "engines/wintermute/ext/plugin_event.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/debugger.h"
 #include "common/events.h"
 #include "common/random.h"
@@ -81,7 +80,7 @@ public:
 
 	virtual bool onScriptShutdown(ScScript *script);
 
-	virtual bool getLayerSize(int *LayerWidth, int *LayerHeight, Rect32 *viewport, bool *customViewport);
+	virtual bool getLayerSize(int *LayerWidth, int *LayerHeight, Common::Rect32 *viewport, bool *customViewport);
 #ifdef ENABLE_WME3D
 	virtual uint32 getAmbientLightColor();
 	virtual bool getFogParams(bool *fogEnabled, uint32 *fogColor, float *start, float *end);
@@ -109,8 +108,8 @@ public:
 	bool _miniUpdateEnabled;
 	virtual void miniUpdate();
 
-	void getMousePos(Point32 *Pos);
-	Rect32 _mouseLockRect;
+	void getMousePos(Common::Point32 *Pos);
+	Common::Rect32 _mouseLockRect;
 
 	bool _shuttingDown;
 
@@ -297,7 +296,7 @@ public:
 	Timer _timerLive;
 
 	BaseObject *_capturedObject;
-	Point32 _mousePos;
+	Common::Point32 _mousePos;
 	bool validObject(BaseObject *object);
 	bool unregisterObject(BaseObject *object);
 	bool registerObject(BaseObject *object);
@@ -336,7 +335,7 @@ public:
 	virtual bool windowLoadHook(UIWindow *win, char **buf, char **params);
 	virtual bool windowScriptMethodHook(UIWindow *win, ScScript *script, ScStack *stack, const char *name);
 	bool getCurrentViewportOffset(int *offsetX = nullptr, int *offsetY = nullptr) const;
-	bool getCurrentViewportRect(Rect32 *rect, bool *custom = nullptr) const;
+	bool getCurrentViewportRect(Common::Rect32 *rect, bool *custom = nullptr) const;
 	bool popViewport();
 	bool pushViewport(BaseViewport *Viewport);
 	bool setActiveObject(BaseObject *Obj);
diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h
index 8b095570ff7..1fe46d59428 100644
--- a/engines/wintermute/base/base_object.h
+++ b/engines/wintermute/base/base_object.h
@@ -113,7 +113,7 @@ public:
 	bool _registrable;
 	bool _zoomable;
 	bool _shadowable;
-	Rect32 _rect;
+	Common::Rect32 _rect;
 	bool _rectSet;
 	int32 _iD;
 	bool _movable;
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 32b2789d30a..79095f32a62 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -775,7 +775,7 @@ bool BasePersistenceManager::transferByte(const char *name, byte *val) {
 
 //////////////////////////////////////////////////////////////////////////
 // RECT
-bool BasePersistenceManager::transferRect32(const char *name, Rect32 *val) {
+bool BasePersistenceManager::transferRect32(const char *name, Common::Rect32 *val) {
 	if (_saving) {
 		_saveStream->writeSint32LE(val->left);
 		_saveStream->writeSint32LE(val->top);
@@ -800,7 +800,7 @@ bool BasePersistenceManager::transferRect32(const char *name, Rect32 *val) {
 
 //////////////////////////////////////////////////////////////////////////
 // POINT
-bool BasePersistenceManager::transferPoint32(const char *name, Point32 *val) {
+bool BasePersistenceManager::transferPoint32(const char *name, Common::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 23e3e559589..1df75b5484d 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -30,7 +30,6 @@
 
 
 #include "engines/wintermute/dctypes.h"
-#include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/base/gfx/xmath.h"
 #include "engines/savestate.h"
 #include "common/stream.h"
@@ -92,8 +91,8 @@ public:
 	bool transferDouble(const char *name, double *val);
 	bool transferBool(const char *name, bool *val);
 	bool transferByte(const char *name, byte *val);
-	bool transferRect32(const char *name, Rect32 *val);
-	bool transferPoint32(const char *name, Point32 *val);
+	bool transferRect32(const char *name, Common::Rect32 *val);
+	bool transferPoint32(const char *name, Common::Point32 *val);
 	bool transferConstChar(const char *name, const char **val);
 	bool transferCharPtr(const char *name, char **val);
 	bool transferString(const char *name, Common::String *val);
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index 047d0c53dee..6f122e93512 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -81,11 +81,11 @@ bool BaseRegion::pointInRegion(int x, int y) {
 		return false;
 	}
 
-	Point32 pt;
+	Common::Point32 pt;
 	pt.x = x;
 	pt.y = y;
 
-	Rect32 rect;
+	Common::Rect32 rect;
 	rect.left = x - 1;
 	rect.right = x + 2;
 	rect.top = y - 1;
@@ -491,7 +491,7 @@ bool BaseRegion::ptInPolygon(int32 x, int32 y) {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseRegion::getBoundingRect(Rect32 *rect) {
+bool BaseRegion::getBoundingRect(Common::Rect32 *rect) {
 	if (_points.getSize() == 0) {
 		BasePlatform::setRectEmpty(rect);
 	} else {
diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h
index 838c9d7ac73..bfb9ad41cdc 100644
--- a/engines/wintermute/base/base_region.h
+++ b/engines/wintermute/base/base_region.h
@@ -40,7 +40,7 @@ public:
 	int32 _lastMimicY;
 	void cleanup();
 	bool mimic(BaseRegion *region, float scale = 100.0f, int x = 0, int y = 0);
-	bool getBoundingRect(Rect32 *rect);
+	bool getBoundingRect(Common::Rect32 *rect);
 	bool ptInPolygon(int32 x, int32 y);
 	DECLARE_PERSISTENT(BaseRegion, BaseObject)
 	bool _active;
@@ -51,7 +51,7 @@ public:
 	bool createRegion();
 	bool loadFile(const char *filename);
 	bool loadBuffer(char *buffer, bool complete = true);
-	Rect32 _rect;
+	Common::Rect32 _rect;
 	BaseArray<BasePoint *> _points;
 	bool saveAsText(BaseDynamicBuffer *buffer, int indent) override { return saveAsText(buffer, indent, nullptr); }
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent, const char *nameOverride);
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index afce32f6d81..2e149b988e5 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -463,15 +463,15 @@ BaseSurface *BaseSprite::getSurface() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSprite::getBoundingRect(Rect32 *rect, int x, int y, float scaleX, float scaleY) {
+bool BaseSprite::getBoundingRect(Common::Rect32 *rect, int x, int y, float scaleX, float scaleY) {
 	if (!rect) {
 		return false;
 	}
 
 	BasePlatform::setRectEmpty(rect);
 	for (int32 i = 0; i < _frames.getSize(); i++) {
-		Rect32 frame;
-		Rect32 temp;
+		Common::Rect32 frame;
+		Common::Rect32 temp;
 		BasePlatform::copyRect(&temp, rect);
 		_frames[i]->getBoundingRect(&frame, x, y, scaleX, scaleY);
 		BasePlatform::unionRect(rect, &temp, &frame);
diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h
index ae4fcc832a2..bfa55ad9e6d 100644
--- a/engines/wintermute/base/base_sprite.h
+++ b/engines/wintermute/base/base_sprite.h
@@ -53,7 +53,7 @@ public:
 	DECLARE_PERSISTENT(BaseSprite, BaseScriptHolder)
 
 	bool _editorAllFrames;
-	bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = Graphics::kDefaultZoomX, float scaleY = Graphics::kDefaultZoomY);
+	bool getBoundingRect(Common::Rect32 *rect, int x, int y, float scaleX = Graphics::kDefaultZoomX, float scaleY = Graphics::kDefaultZoomY);
 	int32 _moveY;
 	int32 _moveX;
 	bool display(int x, int y, BaseObject *registerOwner = nullptr, float zoomX = Graphics::kDefaultZoomX, float zoomY = Graphics::kDefaultZoomY, uint32 alpha = Graphics::kDefaultRgbaMod, float rotate = Graphics::kDefaultAngle, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL);
@@ -72,7 +72,7 @@ public:
 	bool draw(int x, int y, BaseObject *Register = nullptr, float zoomX = Graphics::kDefaultZoomX, float zoomY = Graphics::kDefaultZoomY, uint32 alpha = Graphics::kDefaultRgbaMod);
 	bool _looping;
 	int32 _currentFrame;
-	bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Rect32 *rect = nullptr);
+	bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Common::Rect32 *rect = nullptr);
 	BaseSprite(BaseGame *inGame, BaseObject *owner = nullptr);
 	~BaseSprite() override;
 	BaseArray<BaseFrame *> _frames;
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index d0f0c378c33..0a133f09e40 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -114,7 +114,7 @@ bool BaseSubFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) {
 	char *params;
 	int cmd;
 	BaseParser parser;
-	Rect32 rect;
+	Common::Rect32 rect;
 	int r = 255, g = 255, b = 255;
 	int ar = 255, ag = 255, ab = 255, alpha = 255;
 	bool customTrans = false;
@@ -217,7 +217,7 @@ bool BaseSubFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) {
 	return STATUS_OK;
 }
 
-Rect32 &BaseSubFrame::getRect() {
+Common::Rect32 &BaseSubFrame::getRect() {
 	if (_wantsDefaultRect && _surface) {
 		BasePlatform::setRect(&_rect, 0, 0, _surface->getWidth(), _surface->getHeight());
 		_wantsDefaultRect = false;
@@ -225,7 +225,7 @@ Rect32 &BaseSubFrame::getRect() {
 	return _rect;
 }
 
-void BaseSubFrame::setRect(Rect32 rect) {
+void BaseSubFrame::setRect(Common::Rect32 rect) {
 	_wantsDefaultRect = false;
 	_rect = rect;
 }
@@ -279,7 +279,7 @@ bool BaseSubFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, fl
 
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSubFrame::getBoundingRect(Rect32 *rect, int x, int y, float scaleX, float scaleY) {
+bool BaseSubFrame::getBoundingRect(Common::Rect32 *rect, int x, int y, float scaleX, float scaleY) {
 	if (!rect) {
 		return false;
 	}
@@ -309,7 +309,7 @@ bool BaseSubFrame::saveAsText(BaseDynamicBuffer *buffer, int indent, bool comple
 		buffer->putTextIndent(indent + 2, "TRANSPARENT { %d,%d,%d }\n", RGBCOLGetR(_transparent), RGBCOLGetG(_transparent), RGBCOLGetB(_transparent));
 	}
 
-	Rect32 rect;
+	Common::Rect32 rect;
 	BasePlatform::setRectEmpty(&rect);
 	if (_surface) {
 		BasePlatform::setRect(&rect, 0, 0, _surface->getWidth(), _surface->getHeight());
diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h
index bcaf29751f8..1360552295f 100644
--- a/engines/wintermute/base/base_sub_frame.h
+++ b/engines/wintermute/base/base_sub_frame.h
@@ -53,7 +53,7 @@ public:
 	~BaseSubFrame() override;
 	bool loadBuffer(char *buffer, int lifeTime, bool keepLoaded);
 	bool draw(int x, int y, BaseObject *registerOwner = nullptr, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL);
-	bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100);
+	bool getBoundingRect(Common::Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100);
 	const char* getSurfaceFilename();
 
 	int32 _hotspotX;
@@ -61,11 +61,11 @@ public:
 	uint32 _alpha;
 	// These two setters and getters are rather useful, as they allow _rect to be lazily defined
 	// Thus we don't need to load the actual graphics before the rect is actually needed.
-	Rect32 &getRect();
-	void setRect(Rect32 rect);
+	Common::Rect32 &getRect();
+	void setRect(Common::Rect32 rect);
 private:
 	bool _wantsDefaultRect;
-	Rect32 _rect;
+	Common::Rect32 _rect;
 	char *_surfaceFilename;
 public:
 	bool _cKDefault;
diff --git a/engines/wintermute/base/base_viewport.cpp b/engines/wintermute/base/base_viewport.cpp
index 6b4c0e61768..90dacdcb68b 100644
--- a/engines/wintermute/base/base_viewport.cpp
+++ b/engines/wintermute/base/base_viewport.cpp
@@ -80,7 +80,7 @@ bool BaseViewport::setRect(int32 left, int32 top, int32 right, int32 bottom, boo
 
 
 //////////////////////////////////////////////////////////////////////////
-Rect32 *BaseViewport::getRect() {
+Common::Rect32 *BaseViewport::getRect() {
 	return &_rect;
 }
 
diff --git a/engines/wintermute/base/base_viewport.h b/engines/wintermute/base/base_viewport.h
index cc7522561a3..9b8efd744f0 100644
--- a/engines/wintermute/base/base_viewport.h
+++ b/engines/wintermute/base/base_viewport.h
@@ -28,9 +28,8 @@
 #ifndef WINTERMUTE_BASE_VIEWPORT_H
 #define WINTERMUTE_BASE_VIEWPORT_H
 
-
+#include "common/rect.h"
 #include "engines/wintermute/base/base.h"
-#include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/persistent.h"
 
 namespace Wintermute {
@@ -39,7 +38,7 @@ class BaseViewport : public BaseClass {
 public:
 	int getHeight() const;
 	int getWidth() const;
-	Rect32 *getRect();
+	Common::Rect32 *getRect();
 	bool setRect(int32 left, int32 top, int32 right, int32 bottom, bool noCheck = false);
 	DECLARE_PERSISTENT(BaseViewport, BaseClass)
 	int32 _offsetY;
@@ -49,7 +48,7 @@ public:
 	~BaseViewport() override;
 	virtual Common::String debuggerToString() const;
 private:
-	Rect32 _rect;
+	Common::Rect32 _rect;
 };
 
 } // End of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index 5af7fd989d4..ac13328e7b1 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -252,7 +252,7 @@ void BaseFontBitmap::drawChar(byte c, int x, int y) {
 	row = c / _numColumns;
 	col = c % _numColumns;
 
-	Rect32 rect;
+	Common::Rect32 rect;
 	/* l t r b */
 	int tileWidth;
 	if (_wholeCell) {
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 07f662ed28c..80af9b9c301 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -210,7 +210,7 @@ void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign
 
 	// and paint it
 	if (surface) {
-		Rect32 rc;
+		Common::Rect32 rc;
 		BasePlatform::setRect(&rc, 0, 0, surface->getWidth(), surface->getHeight());
 		for (int32 i = 0; i < _layers.getSize(); i++) {
 			uint32 color = _layers[i]->_color;
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 58220bb77b4..f6f063f9d39 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -89,7 +89,7 @@ void BaseRenderer::initLoop() {
 
 //////////////////////////////////////////////////////////////////////
 BaseObject *BaseRenderer::getObjectAt(int x, int y) {
-	Point32 point;
+	Common::Point32 point;
 	point.x = x;
 	point.y = y;
 
@@ -287,7 +287,7 @@ bool BaseRenderer::setScreenViewport() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseRenderer::setViewport(Rect32 *rect) {
+bool BaseRenderer::setViewport(Common::Rect32 *rect) {
 	return setViewport(rect->left + _drawOffsetX,
 	                   rect->top + _drawOffsetY,
 	                   rect->right + _drawOffsetX,
@@ -299,7 +299,7 @@ bool BaseRenderer::clipCursor() {
 	// TODO: Reimplement this. (Currently aspect-indpendence isn't quite finished)
 	/*
 	if (!_windowed) {
-	    Rect32 rc;
+	    Common::Rect32 rc;
 	    GetWindowRect(_window, &rc);
 
 	    // if "maintain aspect ratio" is in effect, lock mouse to visible area
@@ -323,7 +323,7 @@ bool BaseRenderer::unclipCursor() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseRenderer::pointInViewport(Point32 *p) {
+bool BaseRenderer::pointInViewport(Common::Point32 *p) {
 	if (p->x < _drawOffsetX) {
 		return false;
 	}
@@ -366,7 +366,7 @@ bool BaseRenderer::displayIndicator() {
 //////////////////////////////////////////////////////////////////////////
 bool BaseRenderer::displaySaveloadImage() {
 	if (_saveLoadImage && !_hasDrawnSaveLoadImage) {
-		Rect32 rc;
+		Common::Rect32 rc;
 		BasePlatform::setRect(&rc, 0, 0, _saveLoadImage->getWidth(), _saveLoadImage->getHeight());
 		if (_loadInProgress) {
 			_saveLoadImage->displayTrans(_loadImageX, _loadImageY, rc);
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index f853b836f08..8e75c6be5f9 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -28,7 +28,6 @@
 #ifndef WINTERMUTE_BASE_RENDERER_H
 #define WINTERMUTE_BASE_RENDERER_H
 
-#include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/base/base.h"
 #include "engines/wintermute/coll_templ.h"
 
@@ -66,7 +65,7 @@ public:
 	 */
 	virtual BaseImage *takeScreenshot(int newWidth = 0, int newHeight = 0) = 0;
 	virtual bool setViewport(int left, int top, int right, int bottom);
-	virtual bool setViewport(Rect32 *rect);
+	virtual bool setViewport(Common::Rect32 *rect);
 	virtual bool setScreenViewport();
 	virtual void setWindowed(bool windowed) = 0;
 
@@ -163,7 +162,7 @@ public:
 	virtual bool endSpriteBatch() {
 		return STATUS_OK;
 	};
-	bool pointInViewport(Point32 *P);
+	bool pointInViewport(Common::Point32 *P);
 	uint32 _forceAlphaColor;
 	uint32 _window;
 	uint32 _clipperWindow;
@@ -209,10 +208,10 @@ public:
 	bool _indicatorDisplay;
 	int32 _indicatorProgress;
 
-	Rect32 _windowRect;
-	Rect32 _viewportRect;
-	Rect32 _screenRect;
-	Rect32 _monitorRect;
+	Common::Rect32 _windowRect;
+	Common::Rect32 _viewportRect;
+	Common::Rect32 _screenRect;
+	Common::Rect32 _monitorRect;
 	int32 _bPP;
 	int32 _height;
 	int32 _width;
diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp
index 313ba3344a6..f162eae6f2e 100644
--- a/engines/wintermute/base/gfx/base_surface.cpp
+++ b/engines/wintermute/base/gfx/base_surface.cpp
@@ -69,7 +69,7 @@ bool BaseSurface::isTransparentAt(int x, int y) {
 }
 
 //////////////////////////////////////////////////////////////////////
-bool BaseSurface::displayHalfTrans(int x, int y, Rect32 rect) {
+bool BaseSurface::displayHalfTrans(int x, int y, Common::Rect32 rect) {
 	return STATUS_FAILED;
 }
 
diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h
index 5a76d0f4447..6c146134cab 100644
--- a/engines/wintermute/base/gfx/base_surface.h
+++ b/engines/wintermute/base/gfx/base_surface.h
@@ -29,7 +29,6 @@
 #define WINTERMUTE_BASE_SURFACE_H
 
 #include "engines/wintermute/base/base.h"
-#include "engines/wintermute/math/rect32.h"
 #include "graphics/surface.h"
 #include "graphics/transform_struct.h"
 
@@ -52,13 +51,13 @@ public:
 	BaseSurface(BaseGame *inGame);
 	~BaseSurface() override;
 
-	virtual bool displayHalfTrans(int x, int y, Rect32 rect);
+	virtual bool displayHalfTrans(int x, int y, Common::Rect32 rect);
 	virtual bool isTransparentAt(int x, int y);
-	virtual bool displayTransRotate(int x, int y, float rotate, int32 hotspotX, int32 hotspotY, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) = 0;
-	virtual bool displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) = 0;
-	virtual bool displayTrans(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0) = 0;
-	virtual bool display(int x, int y, Rect32 rect, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) = 0;
-	virtual bool displayTiled(int x, int y, Rect32 rect, int numTimesX, int numTimesY) = 0;
+	virtual bool displayTransRotate(int x, int y, float rotate, int32 hotspotX, int32 hotspotY, Common::Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) = 0;
+	virtual bool displayTransZoom(int x, int y, Common::Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) = 0;
+	virtual bool displayTrans(int x, int y, Common::Rect32 rect, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0) = 0;
+	virtual bool display(int x, int y, Common::Rect32 rect, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) = 0;
+	virtual bool displayTiled(int x, int y, Common::Rect32 rect, int numTimesX, int numTimesY) = 0;
 	virtual bool restore();
 	virtual bool create(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime = -1, bool keepLoaded = false) = 0;
 	virtual bool create(int width, int height);
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index a9f67bd1198..83bfae42094 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -233,7 +233,7 @@ void BaseRenderOSystem::fade(uint16 alpha) {
 void BaseRenderOSystem::fadeToColor(byte r, byte g, byte b, byte a) {
 	Common::Rect fillRect;
 
-	Rect32 rc;
+	Common::Rect32 rc;
 	_gameRef->getCurrentViewportRect(&rc);
 	fillRect.left = (int16)rc.left;
 	fillRect.top = (int16)rc.top;
@@ -506,14 +506,14 @@ void BaseRenderOSystem::modTargetRect(Common::Rect *rect) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-void BaseRenderOSystem::pointFromScreen(Point32 *point) {
+void BaseRenderOSystem::pointFromScreen(Common::Point32 *point) {
 	point->x = (int16)(point->x / _ratioX - _borderLeft / _ratioX + _renderRect.left);
 	point->y = (int16)(point->y / _ratioY - _borderTop / _ratioY + _renderRect.top);
 }
 
 
 //////////////////////////////////////////////////////////////////////////
-void BaseRenderOSystem::pointToScreen(Point32 *point) {
+void BaseRenderOSystem::pointToScreen(Common::Point32 *point) {
 	point->x = (int16)MathUtil::roundUp(point->x * _ratioX) + _borderLeft - _renderRect.left;
 	point->y = (int16)MathUtil::roundUp(point->y * _ratioY) + _borderTop - _renderRect.top;
 }
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index c9493f6216a..971fac9f481 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -97,10 +97,10 @@ public:
 	void drawFromQueuedTicket(const RenderQueueIterator &ticket);
 
 	bool setViewport(int left, int top, int right, int bottom) override;
-	bool setViewport(Rect32 *rect) override { return BaseRenderer::setViewport(rect); }
+	bool setViewport(Common::Rect32 *rect) override { return BaseRenderer::setViewport(rect); }
 	void modTargetRect(Common::Rect *rect);
-	void pointFromScreen(Point32 *point);
-	void pointToScreen(Point32 *point);
+	void pointFromScreen(Common::Point32 *point);
+	void pointToScreen(Common::Point32 *point);
 
 	float getScaleRatioX() const override {
 		return _ratioX;
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index 3472ce858ab..4dc4ef365ff 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -148,7 +148,7 @@ bool BaseSurfaceOSystem::finishLoad() {
 			}
 		}
 	}
-	
+
 	if (_filename.hasSuffix(".bmp")) {
 		// Ignores alpha channel for BMPs
 		needsColorKey = true;
@@ -284,29 +284,30 @@ bool BaseSurfaceOSystem::endPixelOp() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSurfaceOSystem::display(int x, int y, Rect32 rect, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
+bool BaseSurfaceOSystem::display(int x, int y, Common::Rect32 rect, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
 	_rotation = 0;
 	return drawSprite(x, y, &rect, nullptr, Graphics::TransformStruct(Graphics::kDefaultZoomX, Graphics::kDefaultZoomY,  mirrorX, mirrorY));
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSurfaceOSystem::displayTrans(int x, int y, Rect32 rect, uint32 alpha, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY, int offsetX, int offsetY) {
+bool BaseSurfaceOSystem::displayTrans(int x, int y, Common::Rect32 rect, uint32 alpha, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY, int offsetX, int offsetY) {
 	_rotation = 0;
 	return drawSprite(x, y, &rect, nullptr,  Graphics::TransformStruct(Graphics::kDefaultZoomX, Graphics::kDefaultZoomY, Graphics::kDefaultAngle, Graphics::kDefaultHotspotX, Graphics::kDefaultHotspotY, blendMode, TS_COLOR(alpha), mirrorX, mirrorY, offsetX, offsetY));
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSurfaceOSystem::displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
+bool BaseSurfaceOSystem::displayTransZoom(int x, int y, Common::Rect32 rect, float zoomX, float zoomY, uint32 alpha, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
 	_rotation = 0;
 	return drawSprite(x, y, &rect, nullptr, Graphics::TransformStruct((int32)zoomX, (int32)zoomY, blendMode, TS_COLOR(alpha), mirrorX, mirrorY));
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSurfaceOSystem::displayTransRotate(int x, int y, float rotate, int32 hotspotX, int32 hotspotY, Rect32 rect, float zoomX, float zoomY, uint32 alpha, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
+bool BaseSurfaceOSystem::displayTransRotate(int x, int y, float rotate, int32 hotspotX, int32 hotspotY, Common::Rect32 rect, float zoomX, float zoomY, uint32 alpha, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
 	Common::Point newHotspot;
 	Common::Rect oldRect(rect.left, rect.top, rect.right, rect.bottom);
 	Graphics::TransformStruct transform = Graphics::TransformStruct(zoomX, zoomY, rotate, hotspotX, hotspotY, blendMode, TS_COLOR(alpha), mirrorX, mirrorY, 0, 0);
-	Rect32 newRect = Graphics::TransformTools::newRect(oldRect, transform, &newHotspot);
+	Common::Rect newRect = Graphics::TransformTools::newRect(oldRect, transform, &newHotspot);
+	Common::Rect32 newRect32(newRect.left, newRect.top, newRect.right, newRect.bottom);
 
 	x -= newHotspot.x;
 	y -= newHotspot.y;
@@ -317,18 +318,18 @@ bool BaseSurfaceOSystem::displayTransRotate(int x, int y, float rotate, int32 ho
 		_rotation = 360.0f + transform._angle;
 		warning("Negative post rotation: %d %d", (int32)transform._angle, (int32)_rotation);
 	}
-	return drawSprite(x, y, &rect, &newRect, transform);
+	return drawSprite(x, y, &rect, &newRect32, transform);
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSurfaceOSystem::displayTiled(int x, int y, Rect32 rect, int numTimesX, int numTimesY) {
+bool BaseSurfaceOSystem::displayTiled(int x, int y, Common::Rect32 rect, int numTimesX, int numTimesY) {
 	assert(numTimesX > 0 && numTimesY > 0);
 	Graphics::TransformStruct transform(numTimesX, numTimesY);
 	return drawSprite(x, y, &rect, nullptr, transform);
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, Rect32 *newRect, Graphics::TransformStruct transform) {
+bool BaseSurfaceOSystem::drawSprite(int x, int y, Common::Rect32 *rect, Common::Rect32 *newRect, Graphics::TransformStruct transform) {
 	BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_gameRef->_renderer);
 
 	_lastUsedTime = _gameRef->getLiveTimer()->getTime();
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
index f1a19e4ddff..0b06f16fffa 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
@@ -53,11 +53,11 @@ public:
 	bool startPixelOp() override;
 	bool endPixelOp() override;
 
-	bool displayTransRotate(int x, int y, float rotate, int32 hotspotX, int32 hotspotY, Rect32 rect, float zoomX, float zoomY, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
-	bool displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
-	bool displayTrans(int x, int y, Rect32 rect, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0) override;
-	bool display(int x, int y, Rect32 rect, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
-	bool displayTiled(int x, int y, Rect32 rect, int numTimesX, int numTimesY) override;
+	bool displayTransRotate(int x, int y, float rotate, int32 hotspotX, int32 hotspotY, Common::Rect32 rect, float zoomX, float zoomY, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
+	bool displayTransZoom(int x, int y, Common::Rect32 rect, float zoomX, float zoomY, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
+	bool displayTrans(int x, int y, Common::Rect32 rect, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0) override;
+	bool display(int x, int y, Common::Rect32 rect, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
+	bool displayTiled(int x, int y, Common::Rect32 rect, int numTimesX, int numTimesY) override;
 	bool putSurface(const Graphics::Surface &surface, bool hasAlpha = false) override;
 	int getWidth() override {
 		if (_width == 0) {
@@ -97,7 +97,7 @@ public:
 private:
 	Graphics::Surface *_surface;
 	bool finishLoad();
-	bool drawSprite(int x, int y, Rect32 *rect, Rect32 *newRect, Graphics::TransformStruct transformStruct);
+	bool drawSprite(int x, int y, Common::Rect32 *rect, Common::Rect32 *newRect, Graphics::TransformStruct transformStruct);
 	void writeAlpha(Graphics::Surface *surface, const Graphics::Surface *mask);
 
 	bool _pixelOpReady;
diff --git a/engines/wintermute/base/gfx/xmath.h b/engines/wintermute/base/gfx/xmath.h
index de6b2ff31c5..ebfb191b364 100644
--- a/engines/wintermute/base/gfx/xmath.h
+++ b/engines/wintermute/base/gfx/xmath.h
@@ -31,7 +31,7 @@
 #ifndef WINTERMUTE_XMATH_H
 #define WINTERMUTE_XMATH_H
 
-#include "engines/wintermute/math/rect32.h"
+#include "common/scummsys.h"
 
 namespace Wintermute {
 
@@ -125,7 +125,7 @@ struct DXMatrix {
 		float _m[4][4];
 		float _m4x4[16];
 	};
-	
+
 	DXMatrix() {}
 	DXMatrix(const float *pf);
 
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index 1288e609b40..ac811a3036d 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -81,7 +81,7 @@ public:
 	int32 _maxBatches;
 	int32 _batchesGenerated;
 
-	Rect32 _border;
+	Common::Rect32 _border;
 	int32 _borderThicknessLeft;
 	int32 _borderThicknessRight;
 	int32 _borderThicknessTop;
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 50192ed9550..04f9b8477de 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -125,7 +125,7 @@ bool PartParticle::update(PartEmitter *emitter, uint32 currentTime, uint32 timer
 
 		// particle hit the border
 		if (!_isDead && !BasePlatform::isRectEmpty(&_border)) {
-			Point32 p;
+			Common::Point32 p;
 			p.x = (int32)_pos.x;
 			p.y = (int32)_pos.y;
 			if (!BasePlatform::ptInRect(&_border, p)) {
diff --git a/engines/wintermute/base/particles/part_particle.h b/engines/wintermute/base/particles/part_particle.h
index 2133263f901..a2b6991d4de 100644
--- a/engines/wintermute/base/particles/part_particle.h
+++ b/engines/wintermute/base/particles/part_particle.h
@@ -28,9 +28,8 @@
 #ifndef WINTERMUTE_PARTPARTICLE_H
 #define WINTERMUTE_PARTPARTICLE_H
 
-
+#include "common/rect.h"
 #include "engines/wintermute/base/base.h"
-#include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/math/vector2.h"
 
 namespace Wintermute {
@@ -59,7 +58,7 @@ public:
 	int32 _alpha1;
 	int32 _alpha2;
 
-	Rect32 _border;
+	Common::Rect32 _border;
 	Vector2 _pos;
 	float _posZ;
 	Vector2 _velocity;
diff --git a/engines/wintermute/ext/wme_vlink.cpp b/engines/wintermute/ext/wme_vlink.cpp
index 8bcd8902034..31653e29803 100644
--- a/engines/wintermute/ext/wme_vlink.cpp
+++ b/engines/wintermute/ext/wme_vlink.cpp
@@ -129,7 +129,7 @@ bool SXVlink::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 							Common::StackLock lock(_frameMutex);
 							texture->putSurface(_surface, false);
 						}
-						texture->display(0, 0, Rect32(texture->getWidth(), texture->getHeight()));
+						texture->display(0, 0, Common::Rect32(texture->getWidth(), texture->getHeight()));
 						_updateNeeded = false;
 						_gameRef->_renderer->flip();
 					}
diff --git a/engines/wintermute/math/rect32.h b/engines/wintermute/math/rect32.h
deleted file mode 100644
index 6607da400e2..00000000000
--- a/engines/wintermute/math/rect32.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef WINTERMUTE_RECT32_H
-#define WINTERMUTE_RECT32_H
-
-#include "common/system.h"
-#include "engines/wintermute/math/floatpoint.h"
-#include "common/rect.h"
-
-namespace Wintermute {
-
-struct Point32 {
-	int32 x;
-	int32 y;
-	Point32() : x(0), y(0) {}
-	Point32(int32 x1, int32 y1) : x(x1), y(y1) {}
-	bool operator==(const Point32 &p) const { return x == p.x && y == p.y; }
-	bool operator!=(const Point32 &p) const { return x != p.x || y != p.y; }
-	Point32 operator+(const Point32 &delta) const { return Point32(x + delta.x, y + delta.y); }
-	Point32 operator-(const Point32 &delta) const { return Point32(x - delta.x, y - delta.y); }
-
-	Point32 &operator+=(const Point32 &delta) {
-		x += delta.x;
-		y += delta.y;
-		return *this;
-	}
-
-	Point32 &operator-=(const Point32 &delta) {
-		x -= delta.x;
-		y -= delta.y;
-		return *this;
-	}
-
-	operator FloatPoint() {
-		return FloatPoint(x,y);
-	}
-
-
-};
-
-struct Rect32 {
-	int32 top, left;        ///< The point at the top left of the rectangle (part of the rect).
-	int32 bottom, right;    ///< The point at the bottom right of the rectangle (not part of the rect).
-
-	Rect32() : top(0), left(0), bottom(0), right(0) {}
-	Rect32(int32 w, int32 h) : top(0), left(0), bottom(h), right(w) {}
-	Rect32(const Common::Rect &rect) : top(rect.top), left(rect.left), bottom(rect.bottom), right(rect.right) {}
-
-	int32 width() const {
-		return right - left;
-	}
-	int32 height() const {
-		return bottom - top;
-	}
-};
-
-} // End of namespace Wintermute
-
-#endif
diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp
index 937f41f49c6..50408ab664d 100644
--- a/engines/wintermute/platform_osystem.cpp
+++ b/engines/wintermute/platform_osystem.cpp
@@ -152,7 +152,7 @@ void BasePlatform::handleEvent(Common::Event *event) {
 //////////////////////////////////////////////////////////////////////////
 // Win32 API bindings
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::getCursorPos(Point32 *lpPoint) {
+bool BasePlatform::getCursorPos(Common::Point32 *lpPoint) {
 	Common::Point p = g_system->getEventManager()->getMousePos();
 	lpPoint->x = p.x;
 	lpPoint->y = p.y;
@@ -172,7 +172,7 @@ bool BasePlatform::getCursorPos(Point32 *lpPoint) {
 
 //////////////////////////////////////////////////////////////////////////
 bool BasePlatform::setCursorPos(int x, int y) {
-	Point32 p;
+	Common::Point32 p;
 	p.x = x;
 	p.y = y;
 
@@ -191,7 +191,7 @@ bool BasePlatform::setCursorPos(int x, int y) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::setRectEmpty(Rect32 *lprc) {
+bool BasePlatform::setRectEmpty(Common::Rect32 *lprc) {
 	if (lprc == nullptr) {
 		return false;
 	}
@@ -200,7 +200,7 @@ bool BasePlatform::setRectEmpty(Rect32 *lprc) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::isRectEmpty(const Rect32 *lprc) {
+bool BasePlatform::isRectEmpty(const Common::Rect32 *lprc) {
 	if (lprc == nullptr) {
 		return false;
 	}
@@ -208,7 +208,7 @@ bool BasePlatform::isRectEmpty(const Rect32 *lprc) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::ptInRect(Rect32 *lprc, Point32 p) {
+bool BasePlatform::ptInRect(Common::Rect32 *lprc, Common::Point32 p) {
 	if (lprc == nullptr) {
 		return false;
 	}
@@ -216,7 +216,7 @@ bool BasePlatform::ptInRect(Rect32 *lprc, Point32 p) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::setRect(Rect32 *lprc, int32 left, int32 top, int32 right, int32 bottom) {
+bool BasePlatform::setRect(Common::Rect32 *lprc, int32 left, int32 top, int32 right, int32 bottom) {
 	if (lprc == nullptr) {
 		return false;
 	}
@@ -229,7 +229,7 @@ bool BasePlatform::setRect(Rect32 *lprc, int32 left, int32 top, int32 right, int
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::intersectRect(Rect32 *lprcDst, const Rect32 *lprcSrc1, const Rect32 *lprcSrc2) {
+bool BasePlatform::intersectRect(Common::Rect32 *lprcDst, const Common::Rect32 *lprcSrc1, const Common::Rect32 *lprcSrc2) {
 	if (lprcDst == nullptr || lprcSrc1 == nullptr || lprcSrc2 == nullptr) {
 		return false;
 	}
@@ -249,7 +249,7 @@ bool BasePlatform::intersectRect(Rect32 *lprcDst, const Rect32 *lprcSrc1, const
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::unionRect(Rect32 *lprcDst, Rect32 *lprcSrc1, Rect32 *lprcSrc2) {
+bool BasePlatform::unionRect(Common::Rect32 *lprcDst, const Common::Rect32 *lprcSrc1, const Common::Rect32 *lprcSrc2) {
 	if (lprcDst == nullptr || lprcSrc1 == nullptr || lprcSrc2 == nullptr) {
 		return false;
 	}
@@ -265,10 +265,10 @@ bool BasePlatform::unionRect(Rect32 *lprcDst, Rect32 *lprcSrc1, Rect32 *lprcSrc2
 		if (isRectEmpty(lprcSrc2)) {
 			*lprcDst = *lprcSrc1;
 		} else {
-			lprcDst->left   = MIN(lprcSrc1->left, lprcSrc2->left);
 			lprcDst->top    = MIN(lprcSrc1->top, lprcSrc2->top);
-			lprcDst->right  = MAX(lprcSrc1->right, lprcSrc2->right);
+			lprcDst->left   = MIN(lprcSrc1->left, lprcSrc2->left);
 			lprcDst->bottom = MAX(lprcSrc1->bottom, lprcSrc2->bottom);
+			lprcDst->right  = MAX(lprcSrc1->right, lprcSrc2->right);
 		}
 	}
 
@@ -276,7 +276,7 @@ bool BasePlatform::unionRect(Rect32 *lprcDst, Rect32 *lprcSrc1, Rect32 *lprcSrc2
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::copyRect(Rect32 *lprcDst, Rect32 *lprcSrc) {
+bool BasePlatform::copyRect(Common::Rect32 *lprcDst, const Common::Rect32 *lprcSrc) {
 	if (lprcDst == nullptr || lprcSrc == nullptr) {
 		return false;
 	}
@@ -286,17 +286,17 @@ bool BasePlatform::copyRect(Rect32 *lprcDst, Rect32 *lprcSrc) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::equalRect(Rect32 *lprc1, Rect32 *lprc2) {
+bool BasePlatform::equalRect(const Common::Rect32 *lprc1, const Common::Rect32 *lprc2) {
 	if (lprc1 == nullptr || lprc2 == nullptr) {
 		return false;
 	}
-	
+
 	return ((lprc1->left == lprc2->left) && (lprc1->right == lprc2->right) &&
 			(lprc1->top == lprc2->top) && (lprc1->bottom == lprc2->bottom));
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BasePlatform::offsetRect(Rect32 *lprc, int32 x, int32 y) {
+bool BasePlatform::offsetRect(Common::Rect32 *lprc, int32 x, int32 y) {
 	if (!lprc)
 		return false;
 	lprc->left   += x;
diff --git a/engines/wintermute/platform_osystem.h b/engines/wintermute/platform_osystem.h
index 84536ac1441..397452f8f8b 100644
--- a/engines/wintermute/platform_osystem.h
+++ b/engines/wintermute/platform_osystem.h
@@ -29,7 +29,6 @@
 #define WINTERMUTE_PLATFORMSDL_H
 
 #include "engines/wintermute/dctypes.h"
-#include "engines/wintermute/math/rect32.h"
 #include "common/events.h"
 
 namespace Wintermute {
@@ -45,18 +44,18 @@ public:
 	static AnsiString getPlatformName();
 
 	// Win32 API bindings
-	static bool getCursorPos(Point32 *lpPoint);
+	static bool getCursorPos(Common::Point32 *lpPoint);
 	static bool setCursorPos(int x, int y);
 
-	static bool setRectEmpty(Rect32 *lprc);
-	static bool isRectEmpty(const Rect32 *lprc);
-	static bool ptInRect(Rect32 *lprc, Point32 p);
-	static bool setRect(Rect32 *lprc, int32 left, int32 top, int32 right, int32 bottom);
-	static bool intersectRect(Rect32 *lprcDst, const Rect32 *lprcSrc1, const Rect32 *lprcSrc2);
-	static bool unionRect(Rect32 *lprcDst, Rect32 *lprcSrc1, Rect32 *lprcSrc2);
-	static bool copyRect(Rect32 *lprcDst, Rect32 *lprcSrc);
-	static bool equalRect(Rect32 *lprc1, Rect32 *lprc2);
-	static bool offsetRect(Rect32 *lprc, int32 x, int32 y);
+	static bool setRectEmpty(Common::Rect32 *lprc);
+	static bool isRectEmpty(const Common::Rect32 *lprc);
+	static bool ptInRect(Common::Rect32 *lprc, Common::Point32 p);
+	static bool setRect(Common::Rect32 *lprc, int32 left, int32 top, int32 right, int32 bottom);
+	static bool intersectRect(Common::Rect32 *lprcDst, const Common::Rect32 *lprcSrc1, const Common::Rect32 *lprcSrc2);
+	static bool unionRect(Common::Rect32 *lprcDst, const Common::Rect32 *lprcSrc1, const Common::Rect32 *lprcSrc2);
+	static bool copyRect(Common::Rect32 *lprcDst, const Common::Rect32 *lprcSrc);
+	static bool equalRect(const Common::Rect32 *lprc1, const Common::Rect32 *lprc2);
+	static bool offsetRect(Common::Rect32 *lprc, int32 x, int32 y);
 
 	// string functions
 	static char *wintermute_strlwr(char *string);
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 45336db3b3d..3b52e1a5f59 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -592,7 +592,7 @@ bool UIButton::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 
 //////////////////////////////////////////////////////////////////////////
 void UIButton::correctSize() {
-	Rect32 rect;
+	Common::Rect32 rect;
 
 	BaseSprite *img = nullptr;
 	if (_image) {
@@ -726,7 +726,7 @@ bool UIButton::display(int offsetX, int offsetY) {
 	int imageY = offsetY + _posY;
 
 	if (image && _centerImage) {
-		Rect32 rc;
+		Common::Rect32 rc;
 		image->getBoundingRect(&rc, 0, 0);
 		imageX += (_width - (rc.right - rc.left)) / 2;
 		imageY += (_height - (rc.bottom - rc.top)) / 2;
diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp
index df288fd8115..58d7e55cb3e 100644
--- a/engines/wintermute/ui/ui_object.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -126,7 +126,7 @@ void UIObject::setListener(BaseScriptHolder *object, BaseScriptHolder *listenerO
 
 //////////////////////////////////////////////////////////////////////////
 void UIObject::correctSize() {
-	Rect32 rect;
+	Common::Rect32 rect;
 
 	if (_width <= 0) {
 		if (_image) {
diff --git a/engines/wintermute/ui/ui_tiled_image.h b/engines/wintermute/ui/ui_tiled_image.h
index c199118597f..5040479b446 100644
--- a/engines/wintermute/ui/ui_tiled_image.h
+++ b/engines/wintermute/ui/ui_tiled_image.h
@@ -48,15 +48,15 @@ public:
 	UITiledImage(BaseGame *inGame = nullptr);
 	~UITiledImage() override;
 	BaseSubFrame *_image;
-	Rect32 _upLeft;
-	Rect32 _upMiddle;
-	Rect32 _upRight;
-	Rect32 _middleLeft;
-	Rect32 _middleMiddle;
-	Rect32 _middleRight;
-	Rect32 _downLeft;
-	Rect32 _downMiddle;
-	Rect32 _downRight;
+	Common::Rect32 _upLeft;
+	Common::Rect32 _upMiddle;
+	Common::Rect32 _upRight;
+	Common::Rect32 _middleLeft;
+	Common::Rect32 _middleMiddle;
+	Common::Rect32 _middleRight;
+	Common::Rect32 _downLeft;
+	Common::Rect32 _downMiddle;
+	Common::Rect32 _downRight;
 };
 
 } // End of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 0679d8d74b6..8b24dafca0b 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -1232,7 +1232,7 @@ bool UIWindow::handleMouse(TMouseEvent event, TMouseButton button) {
 	if (!BasePlatform::isRectEmpty(&_dragRect)) {
 		// start drag
 		if (event == MOUSE_CLICK && button == MOUSE_BUTTON_LEFT) {
-			Rect32 dragRect = _dragRect;
+			Common::Rect32 dragRect = _dragRect;
 			int offsetX, offsetY;
 			getTotalOffset(&offsetX, &offsetY);
 			BasePlatform::offsetRect(&dragRect, _posX + offsetX, _posY + offsetY);
diff --git a/engines/wintermute/ui/ui_window.h b/engines/wintermute/ui/ui_window.h
index 56c0478402e..1c2e123585a 100644
--- a/engines/wintermute/ui/ui_window.h
+++ b/engines/wintermute/ui/ui_window.h
@@ -60,14 +60,14 @@ public:
 	TWindowMode _mode;
 	bool moveFocus(bool forward = true);
 	bool handleMouse(TMouseEvent Event, TMouseButton Button) override;
-	Point32 _dragFrom;
+	Common::Point32 _dragFrom;
 	bool _dragging;
 	DECLARE_PERSISTENT(UIWindow, UIObject)
 	bool _transparent;
 	bool showWidget(const char *name, bool visible = true);
 	bool enableWidget(const char *name, bool enable = true);
-	Rect32 _titleRect;
-	Rect32 _dragRect;
+	Common::Rect32 _titleRect;
+	Common::Rect32 _dragRect;
 	bool display(int offsetX = 0, int offsetY = 0) override;
 	UIWindow(BaseGame *inGame);
 	~UIWindow() override;
diff --git a/engines/wintermute/utils/utils.h b/engines/wintermute/utils/utils.h
index 6c467d741fc..1b1313c5dee 100644
--- a/engines/wintermute/utils/utils.h
+++ b/engines/wintermute/utils/utils.h
@@ -29,7 +29,6 @@
 #define WINTERMUTE_UTILS_H
 
 #include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/math/rect32.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/video/video_player.cpp b/engines/wintermute/video/video_player.cpp
index be9a5f621dc..f42c678f33f 100644
--- a/engines/wintermute/video/video_player.cpp
+++ b/engines/wintermute/video/video_player.cpp
@@ -162,7 +162,7 @@ bool VideoPlayer::update() {
 
 //////////////////////////////////////////////////////////////////////////
 bool VideoPlayer::display() {
-	Rect32 rc;
+	Common::Rect32 rc;
 	bool res;
 
 	if (_texture && _videoFrameReady) {
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 73692a52733..3ab59e2bff0 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -357,7 +357,7 @@ bool VideoTheoraPlayer::writeVideo(const Graphics::Surface *decodedFrame) {
 
 //////////////////////////////////////////////////////////////////////////
 bool VideoTheoraPlayer::display(uint32 alpha) {
-	Rect32 rc;
+	Common::Rect32 rc;
 	bool res;
 
 	if (_texture && _videoFrameReady) {

More information about the Scummvm-git-logs mailing list