[Scummvm-cvs-logs] scummvm master -> 400bda78d2ad98c7671c384e58cb6d74ba7579fd

bluegr md5 at scummvm.org
Sat Dec 17 15:22:27 CET 2011


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:
400bda78d2 DREAMWEB: Fix another regression in selectOb() (thanks wjp)


Commit: 400bda78d2ad98c7671c384e58cb6d74ba7579fd
    https://github.com/scummvm/scummvm/commit/400bda78d2ad98c7671c384e58cb6d74ba7579fd
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-17T06:21:32-08:00

Commit Message:
DREAMWEB: Fix another regression in selectOb() (thanks wjp)

Changed paths:
    engines/dreamweb/object.cpp



diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 3cea2a5..dbae7e2 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -401,8 +401,19 @@ void DreamGenContext::selectOb() {
 	data.byte(kWithobject) = objectId & 0x00FF;
 	data.byte(kWithtype)   = objectId >> 8;
 
-	if (objectId == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
-		data.byte(kCommandtype) = 221;
+	if (objectId == data.word(kOldsubject)) {
+		if (data.byte(kCommandtype) == 221) {
+			// Object already selected
+			if (data.word(kMousebutton) != data.word(kOldbutton) && (data.word(kMousebutton) & 1)) {
+				delPointer();
+				data.byte(kInvopen) = 0;
+				useRoutine();
+			}
+			return;
+		} else {
+			data.byte(kCommandtype) = 221;
+		}
+	}
 
 	data.word(kOldsubject) = objectId;
 	commandWithOb(0, data.byte(kWithtype), data.byte(kWithobject));






More information about the Scummvm-git-logs mailing list