From 6078bf7eba1a10bfd737a874744a11870f485f75 Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Sun, 16 Feb 2014 00:12:26 +0100
Subject: BBVS: Remove rectIntersection and use Rect::findIntersectingRect
 instead

---
 engines/bbvs/bbvs.cpp | 12 ++----------
 engines/bbvs/bbvs.h   |  1 -
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index d3af885599..77288b58c7 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -1780,18 +1780,10 @@ void BbvsEngine::turnObject(SceneObject *sceneObject) {
 	}
 }
 
-bool BbvsEngine::rectIntersection(const Common::Rect &rect1, const Common::Rect &rect2, Common::Rect &outRect) {
-	outRect.left = MAX(rect1.left, rect2.left);
-	outRect.top = MAX(rect1.top, rect2.top);
-	outRect.right = MIN(rect1.right, rect2.right);
-	outRect.bottom = MIN(rect1.bottom, rect2.bottom);
-	return !outRect.isEmpty();
-}
-
 int BbvsEngine::rectSubtract(const Common::Rect &rect1, const Common::Rect &rect2, Common::Rect *outRects) {
 	int count = 0;
-	Common::Rect workRect;
-	if (rectIntersection(rect1, rect2, workRect)) {
+	Common::Rect workRect = rect1.findIntersectingRect(rect2);
+	if (!workRect.isEmpty()) {
 		count = 0;
 		outRects[count] = Common::Rect(rect2.width(), workRect.top - rect2.top);
 		if (!outRects[count].isEmpty()) {
diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h
index 4a134032de..5853b8074e 100644
--- a/engines/bbvs/bbvs.h
+++ b/engines/bbvs/bbvs.h
@@ -341,7 +341,6 @@ public:
 	void walkObject(SceneObject *sceneObject, const Common::Point &destPt, int walkSpeed);
 	void turnObject(SceneObject *sceneObject);
 
-	bool rectIntersection(const Common::Rect &rect1, const Common::Rect &rect2, Common::Rect &outRect);
 	int rectSubtract(const Common::Rect &rect1, const Common::Rect &rect2, Common::Rect *outRects);
 
 	WalkInfo *addWalkInfo(int16 x, int16 y, int delta, int direction, int16 midPtX, int16 midPtY, int walkAreaIndex);
-- 
cgit v1.2.3