From 07cebdbf2b70e02b12d32880d23dbe293ab12358 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 9 Jul 2012 12:27:06 +0200
Subject: WINTERMUTE: Change usage of Common::Rect to our own 32-bit variant.

---
 engines/wintermute/utils/utils.cpp | 2 +-
 engines/wintermute/utils/utils.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/wintermute/utils')

diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp
index ae64cd0686..9efc7b8935 100644
--- a/engines/wintermute/utils/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
@@ -45,7 +45,7 @@ static inline unsigned Sqr(int x) {
 
 
 //////////////////////////////////////////////////////////////////////////////////
-void CBUtils::clip(int *destX, int *destY, Common::Rect *srcRect, Common::Rect *destRect) {
+void CBUtils::clip(int *destX, int *destY, Rect32 *srcRect, Rect32 *destRect) {
 	// If it's partly off the right side of the screen
 	if (*destX + (srcRect->right - srcRect->left) > destRect->right)
 		srcRect->right -= *destX + (srcRect->right - srcRect->left) - destRect->right;
diff --git a/engines/wintermute/utils/utils.h b/engines/wintermute/utils/utils.h
index e178d35853..d75bb8c550 100644
--- a/engines/wintermute/utils/utils.h
+++ b/engines/wintermute/utils/utils.h
@@ -30,6 +30,7 @@
 #define WINTERMUTE_UTILS_H
 
 #include "engines/wintermute/wintypes.h"
+#include "engines/wintermute/Math/Rect32.h"
 
 namespace WinterMute {
 
@@ -37,7 +38,7 @@ class CBGame;
 
 class CBUtils {
 public:
-	static void clip(int *destX, int *destY, Common::Rect *srcRect, Common::Rect *destRect);
+	static void clip(int *destX, int *destY, Rect32 *srcRect, Rect32 *destRect);
 	static void swap(int *a, int *b);
 	static bool strBeginsI(const char *string, const char *fragment);
 	static float normalizeAngle(float angle);
-- 
cgit v1.2.3