aboutsummaryrefslogtreecommitdiff
path: root/engines/illusions/bbdou
diff options
context:
space:
mode:
authorjohndoe1232015-12-10 22:16:25 +0100
committerEugene Sandulenko2018-07-20 06:43:33 +0000
commit869d342e9f110374683002d405803d01d365119b (patch)
tree5aaa3f091594dd1a46d43628011b8e3e9d1dd625 /engines/illusions/bbdou
parent27a5e93268310062767c52e6fd1effa2e39920e4 (diff)
downloadscummvm-rg350-869d342e9f110374683002d405803d01d365119b.tar.gz
scummvm-rg350-869d342e9f110374683002d405803d01d365119b.tar.bz2
scummvm-rg350-869d342e9f110374683002d405803d01d365119b.zip
ILLUSIONS: BBDOU: Implement getOverlappedObjectAccurate and related functions
Diffstat (limited to 'engines/illusions/bbdou')
-rw-r--r--engines/illusions/bbdou/bbdou_specialcode.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/illusions/bbdou/bbdou_specialcode.cpp b/engines/illusions/bbdou/bbdou_specialcode.cpp
index 9278a41813..497bc561b0 100644
--- a/engines/illusions/bbdou/bbdou_specialcode.cpp
+++ b/engines/illusions/bbdou/bbdou_specialcode.cpp
@@ -489,10 +489,10 @@ void BbdouSpecialCode::cursorInteractControlRoutine(Control *cursorControl, uint
Control *overlappedControl = 0;
if (cursorData._flags & 1) {
- foundOverlapped = 0;
+ foundOverlapped = false;
} else if (_vm->getCurrentScene() == 0x1000D) {
- /* TODO foundOverlapped = artcntrlGetOverlappedObjectAccurate(cursorControl, cursorPos,
- &overlappedControl, cursorData._item10._field58);*/
+ foundOverlapped = _vm->_controls->getOverlappedObjectAccurate(cursorControl, cursorPos,
+ &overlappedControl, cursorData._item10._field58);
} else {
foundOverlapped = _vm->_controls->getOverlappedObject(cursorControl, cursorPos,
&overlappedControl, cursorData._item10._field58);
@@ -660,17 +660,15 @@ void BbdouSpecialCode::cursorCrosshairControlRoutine(Control *cursorControl, uin
}
- Common::Point cursorPos = getBackgroundCursorPos(cursorPos);
+ Common::Point cursorPos = getBackgroundCursorPos(screenCursorPos);
bool foundOverlapped = false;
Control *overlappedControl = 0;
if (cursorData._flags & 1)
foundOverlapped = false;
else {
- /* TODO Implement getOverlappedObjectAccurate
foundOverlapped = _vm->_controls->getOverlappedObjectAccurate(cursorControl, cursorPos,
&overlappedControl, cursorData._item10._field58);
- */
}
if (foundOverlapped) {