aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-01-15 03:03:00 +0000
committerTravis Howell2004-01-15 03:03:00 +0000
commit19707c748fd46620027ac50a01236cfa880af29e (patch)
treee1623ab55236459a1c27296d5502a537f8779392 /scumm
parent6752f57473d9bbfdcd2acd66f2c70ce2c6e76e0b (diff)
downloadscummvm-rg350-19707c748fd46620027ac50a01236cfa880af29e.tar.gz
scummvm-rg350-19707c748fd46620027ac50a01236cfa880af29e.tar.bz2
scummvm-rg350-19707c748fd46620027ac50a01236cfa880af29e.zip
Only stop walkScript if it is been used.
svn-id: r12398
Diffstat (limited to 'scumm')
-rw-r--r--scumm/actor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index a9fcd3da58..e2a0f6636c 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -90,7 +90,8 @@ void Actor::initActor(int mode) {
memset(sound, 0, sizeof(sound));
targetFacing = facing;
- _vm->stopScript(walkScript);
+ if (walkScript)
+ _vm->stopScript(walkScript);
moving = 0;
shadow_mode = 0;
@@ -701,9 +702,8 @@ void Actor::adjustActorPos() {
moving = 0;
cost.soundCounter = 0;
- if (_vm->_features & GF_NEW_COSTUMES) {
+ if (walkScript)
_vm->stopScript(walkScript);
- }
if (walkbox != kInvalidBox) {
byte flags = _vm->getBoxFlags(walkbox);