aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb
diff options
context:
space:
mode:
authorFilippos Karapetis2011-12-17 01:39:29 +0200
committerFilippos Karapetis2011-12-17 01:39:29 +0200
commitb289533e4d972c68391bd3d84c3b87ad20f08c52 (patch)
tree73a5fccd734bb7c60fdce7e51764198f66933949 /engines/dreamweb
parentb371c46af9d5dd7e1282a9e227a853e0d2054fb2 (diff)
downloadscummvm-rg350-b289533e4d972c68391bd3d84c3b87ad20f08c52.tar.gz
scummvm-rg350-b289533e4d972c68391bd3d84c3b87ad20f08c52.tar.bz2
scummvm-rg350-b289533e4d972c68391bd3d84c3b87ad20f08c52.zip
DREAMWEB: Fix regression in identifyOb
Diffstat (limited to 'engines/dreamweb')
-rw-r--r--engines/dreamweb/object.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 64f70ada98..747b7934b4 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -313,9 +313,15 @@ void DreamGenContext::openOb() {
}
void DreamGenContext::identifyOb() {
- if (data.word(kWatchingtime) != 0 ||
- data.word(kMousex) - data.word(kMapadx) >= 22 * 8 ||
- data.word(kMousey) - data.word(kMapady) >= 20 * 8) {
+ if (data.word(kWatchingtime) != 0) {
+ blank();
+ return;
+ }
+
+ ax = data.word(kMousex) - data.word(kMapadx);
+ bx = data.word(kMousey) - data.word(kMapady);
+
+ if (ax >= 22 * 8 || bx >= 20 * 8) {
blank();
return;
}
@@ -325,8 +331,6 @@ void DreamGenContext::identifyOb() {
push(ax);
findPathOfPoint();
data.byte(kPointerspath) = dl;
- ax = pop();
- push(ax);
findFirstPath();
data.byte(kPointerfirstpath) = al;
ax = pop();