aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v0.cpp
diff options
context:
space:
mode:
authorKirben2014-12-07 15:09:36 +1100
committerKirben2014-12-07 15:09:36 +1100
commitdcd0f597e6026e248ff6e2db0224f3f60626cdca (patch)
treef616b8ed6ae0b0ce56f7c81dd65ad4af84754ded /engines/scumm/script_v0.cpp
parentd8af639dfcbdae3c99f72c4c4ec4f07410d5915c (diff)
parent4b1b9ec66f5889fd20d88f8f7f565e8448ac8389 (diff)
downloadscummvm-rg350-dcd0f597e6026e248ff6e2db0224f3f60626cdca.tar.gz
scummvm-rg350-dcd0f597e6026e248ff6e2db0224f3f60626cdca.tar.bz2
scummvm-rg350-dcd0f597e6026e248ff6e2db0224f3f60626cdca.zip
Merge pull request #539 from segrax/master
SCUMM: Maniac V0: Original Walk Code Implementation
Diffstat (limited to 'engines/scumm/script_v0.cpp')
-rw-r--r--engines/scumm/script_v0.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index af39fdaad8..90291535fd 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -707,17 +707,14 @@ void ScummEngine_v0::o_animateActor() {
}
a->animateActor(anim);
- a->animateCostume();
}
void ScummEngine_v0::o_getActorMoving() {
getResultPos();
int act = getVarOrDirectByte(PARAM_1);
Actor *a = derefActor(act, "o_getActorMoving");
- if (a->_moving)
- setResult(1);
- else
- setResult(2);
+
+ setResult(a->_moving);
}
void ScummEngine_v0::o_putActorAtObject() {