[Scummvm-cvs-logs] scummvm master -> 133cfc3ae9de62daa3b3aa9cd7a9d0328b4043dc
wjp
wjp at usecode.org
Sun Dec 18 15:57:57 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
133cfc3ae9 DREAMWEB: Fix yet another regression in setPickup
Commit: 133cfc3ae9de62daa3b3aa9cd7a9d0328b4043dc
https://github.com/scummvm/scummvm/commit/133cfc3ae9de62daa3b3aa9cd7a9d0328b4043dc
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-18T06:56:59-08:00
Commit Message:
DREAMWEB: Fix yet another regression in setPickup
getAnyAd and getEitherAd have different inputs, so can't be
interchanged...
Changed paths:
engines/dreamweb/object.cpp
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 473d876..53ecc0c 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;
More information about the Scummvm-git-logs
mailing list