DREAMWEB: Fix multiple regressions in setPickup

This commit is contained in:
Willem Jan Palenstijn
2011-12-18 13:06:05 +01:00
parent 4178ad6b68
commit feaf297c75
+3 -3
View File
@@ -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 {