diff options
| author | Willem Jan Palenstijn | 2011-12-18 15:55:27 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-12-18 15:56:59 +0100 |
| commit | 133cfc3ae9de62daa3b3aa9cd7a9d0328b4043dc (patch) | |
| tree | afb0675008a9ebb4b1e1275f15609bccb1324ce9 /engines/dreamweb/object.cpp | |
| parent | 62dc71a73a894426cb2f5c61e26ab53b0c9f06ad (diff) | |
| download | scummvm-rg350-133cfc3ae9de62daa3b3aa9cd7a9d0328b4043dc.tar.gz scummvm-rg350-133cfc3ae9de62daa3b3aa9cd7a9d0328b4043dc.tar.bz2 scummvm-rg350-133cfc3ae9de62daa3b3aa9cd7a9d0328b4043dc.zip | |
DREAMWEB: Fix yet another regression in setPickup
getAnyAd and getEitherAd have different inputs, so can't be
interchanged...
Diffstat (limited to 'engines/dreamweb/object.cpp')
| -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 473d876ce8..53ecc0c362 100644 --- a/engines/dreamweb/object.cpp +++ b/engines/dreamweb/object.cpp @@ -431,9 +431,9 @@ void DreamGenContext::selectOb() { void DreamGenContext::setPickup() { if (data.byte(kObjecttype) != kSetObjectType1 && data.byte(kObjecttype) != kSetObjectType3) { // The original called getAnyAd() here. However, since object types - // 1 and 3 are excluded, the resulting object is a DynObject, so - // we can use getEitherAd() instead. - DynObject *object = getEitherAdCPP(); + // 1 and 3 are excluded, the resulting object is a DynObject + uint8 dummy; + DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy); if (object->mapad[0] == 4) { blank(); return; |