aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorTravis Howell2010-10-25 08:03:55 +0000
committerTravis Howell2010-10-25 08:03:55 +0000
commit4f0cc6a435d725e62d38a4c7bdbd597f7f142972 (patch)
treedb84e6f8ebb6401b6b20a6dad9ef64915451aa23 /engines/scumm/script_v2.cpp
parentf228c76b35ba5362ffac6fa7cc86fe1acd5fa8f7 (diff)
downloadscummvm-rg350-4f0cc6a435d725e62d38a4c7bdbd597f7f142972.tar.gz
scummvm-rg350-4f0cc6a435d725e62d38a4c7bdbd597f7f142972.tar.bz2
scummvm-rg350-4f0cc6a435d725e62d38a4c7bdbd597f7f142972.zip
SCUMM: Add patch #3093541 - MMC64: Actor Walk / Object Fix.
svn-id: r53806
Diffstat (limited to 'engines/scumm/script_v2.cpp')
-rw-r--r--engines/scumm/script_v2.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index bc8446d16f..d3a2272a39 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1174,6 +1174,8 @@ void ScummEngine_v2::o2_walkActorToObject() {
int obj;
Actor *a;
+ _v0ObjectFlag = 0;
+
a = derefActor(getVarOrDirectByte(PARAM_1), "o2_walkActorToObject");
obj = getVarOrDirectWord(PARAM_2);
if (whereIsObject(obj) != WIO_NOT_FOUND) {
@@ -1182,6 +1184,7 @@ void ScummEngine_v2::o2_walkActorToObject() {
AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
x = r.x;
y = r.y;
+
a->startWalkActor(x, y, dir);
}
}