[Scummvm-cvs-logs] scummvm master -> 36ea44ea91479f5d6b9ffc27697a86dbf7fffdf1

[bluegr]

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:
36ea44ea91 DREAMWEB: Revert the changes in zoomOnOff() from ddddce372. Some cleanup


Commit: 36ea44ea91479f5d6b9ffc27697a86dbf7fffdf1
    https://github.com/scummvm/scummvm/commit/36ea44ea91479f5d6b9ffc27697a86dbf7fffdf1
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-06T08:10:45-08:00

Commit Message:
DREAMWEB: Revert the changes in zoomOnOff() from ddddce372. Some cleanup

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index cd5fab9..5a769e0 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;