aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/dreamweb/object.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 4daa5091a5..473d876ce8 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 {