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

[wjp]

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:
e9b91b86a0 DREAMWEB: Fix getBackToOps and setWalk


Commit: e9b91b86a0859e1911d8a26193548bb3fa511920
    https://github.com/scummvm/scummvm/commit/e9b91b86a0859e1911d8a26193548bb3fa511920
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-05T23:36:03-08:00

Commit Message:
DREAMWEB: Fix getBackToOps and setWalk

Changed paths:
    engines/dreamweb/pathfind.cpp
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 6b49a87..1dd616f 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -93,7 +93,7 @@ void DreamGenContext::setWalk() {
 	} else {
 		data.byte(kDestination) = data.byte(kPointerspath);
 		data.byte(kFinaldest) = data.byte(kPointerspath);
-		if (data.word(kMousebutton) != 2 || data.word(kMousebutton) == 3) {
+		if (data.word(kMousebutton) != 2 || data.word(kCommandtype) == 3) {
 			autoSetWalk();
 		} else {
 			data.byte(kWalkandexam) = 1;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b05b554..1a26385 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3461,7 +3461,7 @@ void DreamGenContext::getBackToOps() {
 	}
 
 	if (data.word(kMousebutton) != data.word(kOldbutton)) {
-		if (!(data.word(kMousebutton) & 1)) {
+		if (data.word(kMousebutton) & 1) {
 			oldToNames();
 			data.byte(kGetback) = 2;
 		}