aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-12-06 18:10:45 +0200
committerFilippos Karapetis2011-12-06 18:10:45 +0200
commit36ea44ea91479f5d6b9ffc27697a86dbf7fffdf1 (patch)
treecfc93a90b2ddcf3ae10a2b2683dddae3b00c656b
parentbb14626630541c845e1cfea00cb6446562124ece (diff)
downloadscummvm-rg350-36ea44ea91479f5d6b9ffc27697a86dbf7fffdf1.tar.gz
scummvm-rg350-36ea44ea91479f5d6b9ffc27697a86dbf7fffdf1.tar.bz2
scummvm-rg350-36ea44ea91479f5d6b9ffc27697a86dbf7fffdf1.zip
DREAMWEB: Revert the changes in zoomOnOff() from ddddce372. Some cleanup
-rw-r--r--engines/dreamweb/stubs.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index cd5fab9637..5a769e05b5 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2229,20 +2229,19 @@ void DreamGenContext::enterSymbol() {
}
void DreamGenContext::zoomOnOff() {
- if (data.word(kWatchingtime) != 0) {
- blank();
- return;
- }
- if (data.byte(kPointermode) == 2) {
+ if (data.word(kWatchingtime) != 0 || data.byte(kPointermode) == 2) {
blank();
return;
}
+
if (data.byte(kCommandtype) != 222) {
data.byte(kCommandtype) = 222;
commandOnly(39);
}
- if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
+
+ if (!(data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
return;
+
data.byte(kZoomon) ^= 1;
createPanel();
data.byte(kNewobs) = 0;