From db7dea36cff7fc398976724b05c927a635574161 Mon Sep 17 00:00:00 2001
From: md5
Date: Wed, 23 Feb 2011 01:49:17 +0200
Subject: SCI: Fixed bug #3049515 - "MOTHERGOOSE CD: Tommy Tucker lock-up"

---
 engines/sci/graphics/compare.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp
index 5f6aef0153..b9d70c3fa8 100644
--- a/engines/sci/graphics/compare.cpp
+++ b/engines/sci/graphics/compare.cpp
@@ -87,17 +87,8 @@ reg_t GfxCompare::canBeHereCheckRectList(reg_t checkObject, const Common::Rect &
 				curRect.right = readSelectorValue(_segMan, curObject, SELECTOR(brRight));
 				curRect.bottom = readSelectorValue(_segMan, curObject, SELECTOR(brBottom));
 				// Check if curRect is within checkRect
-				// TODO: This check is slightly odd, because it means that a rect is not contained
-				// in itself. It may very well be that the original SCI engine did it just
-				// this way, so it should not be changed lightly. However, somebody should
-				// confirm whether the original engine really did it this way. Then, update
-				// this comment accordingly, and, if necessary, fix the code.
-				if (curRect.right > checkRect.left &&
-				    curRect.left < checkRect.right &&
-				    curRect.bottom > checkRect.top &&
-				    curRect.top < checkRect.bottom) {
+				if (checkRect.contains(curRect))
 					return curObject;
-				}
 			}
 		}
 		curAddress = curNode->succ;
-- 
cgit v1.2.3