aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTobias Gunkel2012-01-22 23:10:46 +0100
committerTobias Gunkel2012-02-11 08:29:18 +0100
commit1da715719c89e5cb185accf48300ba1d75c63b96 (patch)
tree104823f5173dc4edfb7123e0f783a6bb0861bf76 /engines/scumm
parentb0201a8df24462b95c786826793e46583349ee1c (diff)
downloadscummvm-rg350-1da715719c89e5cb185accf48300ba1d75c63b96.tar.gz
scummvm-rg350-1da715719c89e5cb185accf48300ba1d75c63b96.tar.bz2
scummvm-rg350-1da715719c89e5cb185accf48300ba1d75c63b96.zip
SCUMM: handle actor freeze in walkToActorOrObject()
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/script.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 6dac647714..31eef50a6a 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1149,9 +1149,9 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
VAR(6) = x;
VAR(7) = y;
- if (!(a->_miscflags & kActorMiscFlagFreeze)) {
- // FIXME: walking already started -> should be stopped if condition not true
- //actorStartWalk();
+ // actor must not move if frozen
+ if (a->_miscflags & kActorMiscFlagFreeze)
+ a->stopActorMoving();
}
}