[Scummvm-cvs-logs] scummvm master -> b289533e4d972c68391bd3d84c3b87ad20f08c52
bluegr
md5 at scummvm.org
Sat Dec 17 00:40:35 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:
b289533e4d DREAMWEB: Fix regression in identifyOb
Commit: b289533e4d972c68391bd3d84c3b87ad20f08c52
https://github.com/scummvm/scummvm/commit/b289533e4d972c68391bd3d84c3b87ad20f08c52
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-16T15:39:29-08:00
Commit Message:
DREAMWEB: Fix regression in identifyOb
Changed paths:
engines/dreamweb/object.cpp
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 64f70ad..747b793 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();
More information about the Scummvm-git-logs
mailing list