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

[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:
feaf297c75 DREAMWEB: Fix multiple regressions in setPickup


Commit: feaf297c7500aaff8a68da0a47466e537f25db4b
    https://github.com/scummvm/scummvm/commit/feaf297c7500aaff8a68da0a47466e537f25db4b
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-18T04:06:05-08:00

Commit Message:
DREAMWEB: Fix multiple regressions in setPickup

Changed paths:
    engines/dreamweb/object.cpp



diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 4daa509..473d876 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -448,7 +448,7 @@ void DreamGenContext::setPickup() {
 		commandWithOb(33, data.byte(kObjecttype), data.byte(kCommand));
 	}
 
-	if (data.word(kMousebutton) == 1 && data.word(kMousebutton) == data.word(kOldbutton))
+	if (data.word(kMousebutton) != 1 || data.word(kMousebutton) == data.word(kOldbutton))
 		return;
 
 	createPanel();
@@ -463,9 +463,9 @@ void DreamGenContext::setPickup() {
 		data.byte(kItemframe) = data.byte(kCommand);
 		data.byte(kOpenedob) = 255;
 		transferToEx();
-		data.byte(kItemframe) = data.byte(kCommand);
+		data.byte(kItemframe) = al;
 		data.byte(kObjecttype) = kExObjectType;
-		DynObject *object = getEitherAdCPP();
+		DynObject *object = getExAd(data.byte(kItemframe));
 		object->mapad[0] = 20;
 		object->mapad[1] = 255;
 	} else {