aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-12-06 17:55:08 +0200
committerFilippos Karapetis2011-12-06 17:55:08 +0200
commitbb14626630541c845e1cfea00cb6446562124ece (patch)
tree91764a001cfc39b9a3c72564dc9fc642b7e68eda
parentf2829a6a6c033c981514d233119648731ee78310 (diff)
downloadscummvm-rg350-bb14626630541c845e1cfea00cb6446562124ece.tar.gz
scummvm-rg350-bb14626630541c845e1cfea00cb6446562124ece.tar.bz2
scummvm-rg350-bb14626630541c845e1cfea00cb6446562124ece.zip
DREAMWEB: Finish off useObject()
-rw-r--r--engines/dreamweb/use.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index e5a616e61d..96df77b955 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -880,17 +880,11 @@ void DreamGenContext::useObject() {
commandWithOb(data.byte(kCommand), data.byte(kObjecttype), 51);
}
-alreadyuse:
- ax = data.word(kMousebutton);
- _cmp(ax, data.word(kOldbutton));
- if (flags.z())
- return /* (nouse) */;
- _and(ax, 1);
- if (!flags.z())
- goto douse;
- return;
-douse:
- useRoutine();
+ if (data.word(kMousebutton) == data.word(kOldbutton))
+ return; // nouse
+
+ if (data.word(kMousebutton) & 1)
+ useRoutine();
}
} /*namespace dreamgen */