aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v0.cpp
diff options
context:
space:
mode:
authorTobias Gunkel2011-12-26 22:01:39 +0100
committerTobias Gunkel2012-02-11 08:02:27 +0100
commit1e7ea7f95e34430ef70907360319537f0c061204 (patch)
treedbe0f3be04a101c5e556de2a942f21cbf60291d3 /engines/scumm/script_v0.cpp
parent05f853edd7e1b80d25678ccd38c23ab3c171adab (diff)
downloadscummvm-rg350-1e7ea7f95e34430ef70907360319537f0c061204.tar.gz
scummvm-rg350-1e7ea7f95e34430ef70907360319537f0c061204.tar.bz2
scummvm-rg350-1e7ea7f95e34430ef70907360319537f0c061204.zip
SCUMM: Fix bug with tracker ID 3072094
MANIAC C64: Bug while getting the stamps from the parcel - ID: 3072094 MMC64: use stamps with envelope - ID: 3095595
Diffstat (limited to 'engines/scumm/script_v0.cpp')
-rw-r--r--engines/scumm/script_v0.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index e2d3f40e8e..71dfbc6a82 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -979,7 +979,15 @@ void ScummEngine_v0::o_setOwnerOf() {
owner = getVarOrDirectByte(PARAM_2);
if (obj == 0)
- obj = _activeInventory;
+ obj = _activeObject;
+
+ // FIXME: the original interpreter seems to set the owner of
+ // an item to remove (new owner 0) to 13 (purple tentacle).
+ // Ignore this behavior for now.
+ /*
+ if (owner == 0)
+ owner = 13;
+ */
setOwnerOf(obj, owner);
}