DREAMWEB: Fix yet another regression in setPickup

getAnyAd and getEitherAd have different inputs, so can't be
interchanged...
This commit is contained in:
Willem Jan Palenstijn 2011-12-18 15:55:27 +01:00
parent 62dc71a73a
commit 133cfc3ae9

View File

@ -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;