aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/compare.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2014-02-17 11:57:18 +0200
committerFilippos Karapetis2014-02-17 12:00:17 +0200
commited400d57fce69a88c9cdaf6dde03c89e22925968 (patch)
tree589c651429226b5ae765b6377f219bc8ee58a6c9 /engines/sci/graphics/compare.cpp
parent9addca7287b7e22f22d80ffc04077187a0693ad3 (diff)
downloadscummvm-rg350-ed400d57fce69a88c9cdaf6dde03c89e22925968.tar.gz
scummvm-rg350-ed400d57fce69a88c9cdaf6dde03c89e22925968.tar.bz2
scummvm-rg350-ed400d57fce69a88c9cdaf6dde03c89e22925968.zip
SCI: Fix NS rect calculation in GK1 (and SCI32 in general)
This fixes the regressions caused by refactoring in SCI32. Thanks to Timo Korvola for tracking down the issue and providing an initial patch in bug #6452
Diffstat (limited to 'engines/sci/graphics/compare.cpp')
-rw-r--r--engines/sci/graphics/compare.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp
index b42063b119..8b89cf4a65 100644
--- a/engines/sci/graphics/compare.cpp
+++ b/engines/sci/graphics/compare.cpp
@@ -241,21 +241,13 @@ void GfxCompare::kernelBaseSetter(reg_t object) {
}
}
-Common::Rect GfxCompare::getNSRect(reg_t object, bool fixRect) {
+Common::Rect GfxCompare::getNSRect(reg_t object) {
Common::Rect nsRect;
nsRect.top = readSelectorValue(_segMan, object, SELECTOR(nsTop));
nsRect.left = readSelectorValue(_segMan, object, SELECTOR(nsLeft));
nsRect.bottom = readSelectorValue(_segMan, object, SELECTOR(nsBottom));
nsRect.right = readSelectorValue(_segMan, object, SELECTOR(nsRight));
- if (fixRect) {
- // nsRect top/left may be negative, adjust accordingly
- if (nsRect.top < 0)
- nsRect.top = 0;
- if (nsRect.left < 0)
- nsRect.left = 0;
- }
-
return nsRect;
}