[Scummvm-cvs-logs] scummvm master -> b273726df14e07d02860bc264b8e7150f3b01324

[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:
b273726df1 DREAMWEB: Fixed mouse button checks (thanks wjp)


Commit: b273726df14e07d02860bc264b8e7150f3b01324
    https://github.com/scummvm/scummvm/commit/b273726df14e07d02860bc264b8e7150f3b01324
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-06T07:08:53-08:00

Commit Message:
DREAMWEB: Fixed mouse button checks (thanks wjp)

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6786ba4..313fec6 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2241,9 +2241,7 @@ void DreamGenContext::zoomOnOff() {
 		data.byte(kCommandtype) = 222;
 		commandOnly(39);
 	}
-	if (data.word(kMousebutton) == data.word(kOldbutton))
-		return;
-	if ((data.word(kMousebutton) & 1) == 0)
+	if (!(data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
 		return;
 	data.byte(kZoomon) ^= 1;
 	createPanel();
@@ -3688,7 +3686,7 @@ void DreamGenContext::nextDest() {
 		commandOnly(28);
 	}
 
-	if ((data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
+	if (!(data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
 		return;	// nodu
 
 	do {
@@ -3719,7 +3717,7 @@ void DreamGenContext::lastDest() {
 		commandOnly(29);
 	}
 
-	if ((data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
+	if (!(data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
 		return;	// nodd
 
 	do {
@@ -3750,7 +3748,7 @@ void DreamGenContext::destSelect() {
 		commandOnly(30);
 	}
 
-	if ((data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
+	if (!(data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
 		return;	// notrav
 
 	getDestInfo();