ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't translate both x and y of the rect in kOnMe if only one of the variables is negative. Fixes the GKEgo hotspot outside of the Madame Cazanoux's house.

Browse Source 
svn-id: r49933
This commit is contained in:
Matthew Hoops
2010-06-17 15:02:18 +00:00
parent 4e7b98db0c
commit f403d0f806
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/sci/engine/kernel32.cpp
+9 -5
View File
@@ -792,11 +792,15 @@ reg_t kOnMe(EngineState *s, int argc, reg_t *argv) {
nsRect.bottom = readSelectorValue(s->_segMan, targetObject, SELECTOR(nsBottom));
uint16 itemX = readSelectorValue(s->_segMan, targetObject, SELECTOR(x));
uint16 itemY = readSelectorValue(s->_segMan, targetObject, SELECTOR(y));
if (nsRect.left < 0 || nsRect.top < 0) {
// If top and left are negative, we need to adjust coordinates by the item's x and y
// (e.g. happens in GK1, day 1, with detective Mosely's hotspot in his office)
nsRect.translate(itemX, itemY);
}
// If top and left are negative, we need to adjust coordinates by the item's x and y
// (e.g. happens in GK1, day 1, with detective Mosely's hotspot in his office)
if (nsRect.left < 0)
nsRect.translate(itemX, 0);
if (nsRect.top < 0)
nsRect.translate(0, itemY);
// HACK: nsLeft and nsTop can be invalid, so try and fix them here using x and y
// (e.g. with the inventory screen in GK1)