diff options
| author | Willem Jan Palenstijn | 2011-12-18 13:06:05 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-12-18 13:06:05 +0100 |
| commit | feaf297c7500aaff8a68da0a47466e537f25db4b (patch) | |
| tree | 782d2f67e1c61a6f3683a53c2328c02c9a39c300 | |
| parent | 4178ad6b681d32de567b00833b18bf992cbffd92 (diff) | |
| download | scummvm-rg350-feaf297c7500aaff8a68da0a47466e537f25db4b.tar.gz scummvm-rg350-feaf297c7500aaff8a68da0a47466e537f25db4b.tar.bz2 scummvm-rg350-feaf297c7500aaff8a68da0a47466e537f25db4b.zip | |
DREAMWEB: Fix multiple regressions in setPickup
| -rw-r--r-- | engines/dreamweb/object.cpp | 6 |
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 { |