[Scummvm-cvs-logs] scummvm master -> db7dea36cff7fc398976724b05c927a635574161
bluegr
md5 at scummvm.org
Wed Feb 23 00:50:07 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
db7dea36cf SCI: Fixed bug #3049515 - "MOTHERGOOSE CD: Tommy Tucker lock-up"
Commit: db7dea36cff7fc398976724b05c927a635574161
https://github.com/scummvm/scummvm/commit/db7dea36cff7fc398976724b05c927a635574161
Author: md5 (md5 at scummvm.org)
Date: 2011-02-22T15:49:17-08:00
Commit Message:
SCI: Fixed bug #3049515 - "MOTHERGOOSE CD: Tommy Tucker lock-up"
Changed paths:
engines/sci/graphics/compare.cpp
diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp
index 5f6aef0..b9d70c3 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;
More information about the Scummvm-git-logs
mailing list