aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/compare.cpp
diff options
context:
space:
mode:
authormd52011-02-23 01:49:17 +0200
committermd52011-02-23 01:49:17 +0200
commitdb7dea36cff7fc398976724b05c927a635574161 (patch)
treedcdead0c803f61e43e83a0c9c504da3fd3398b80 /engines/sci/graphics/compare.cpp
parent285d33d9c2aca243ede2af3117c7c94e6dd818e2 (diff)
downloadscummvm-rg350-db7dea36cff7fc398976724b05c927a635574161.tar.gz
scummvm-rg350-db7dea36cff7fc398976724b05c927a635574161.tar.bz2
scummvm-rg350-db7dea36cff7fc398976724b05c927a635574161.zip
SCI: Fixed bug #3049515 - "MOTHERGOOSE CD: Tommy Tucker lock-up"
Diffstat (limited to 'engines/sci/graphics/compare.cpp')
-rw-r--r--engines/sci/graphics/compare.cpp11
1 files changed, 1 insertions, 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;