aboutsummaryrefslogtreecommitdiff
path: root/script_v1.cpp
diff options
context:
space:
mode:
authorJames Brown2002-06-25 02:04:43 +0000
committerJames Brown2002-06-25 02:04:43 +0000
commit38f89eff0b51d3fea8b6cf7035dc68b75d01a383 (patch)
tree7f7d884ce8f1223c70e62a15628882b9ee567891 /script_v1.cpp
parent88e176f1552588e4a84f5114ee7dcd4e0d6c1f96 (diff)
downloadscummvm-rg350-38f89eff0b51d3fea8b6cf7035dc68b75d01a383.tar.gz
scummvm-rg350-38f89eff0b51d3fea8b6cf7035dc68b75d01a383.tar.bz2
scummvm-rg350-38f89eff0b51d3fea8b6cf7035dc68b75d01a383.zip
MadMoose's bugfix for 555890 - DOTT: Inventory items not changing name
svn-id: r4427
Diffstat (limited to 'script_v1.cpp')
-rw-r--r--script_v1.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/script_v1.cpp b/script_v1.cpp
index d94969022f..8615654373 100644
--- a/script_v1.cpp
+++ b/script_v1.cpp
@@ -1293,9 +1293,13 @@ void Scumm::o5_getActorScale()
void Scumm::o5_getActorWalkBox()
{
+ Actor *a;
getResultPos();
- setResult(derefActorSafe(getVarOrDirectByte(0x80), "o5_getActorWalkbox")->
- walkbox);
+ a = derefActorSafe(getVarOrDirectByte(0x80), "o5_getActorWalkbox");
+ if (a) // FIXME - bug 572977 workaround
+ setResult(a->walkbox);
+ else
+ setResult(0);
}
void Scumm::o5_getActorWidth()