aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/scumm/actor.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 3353db0151..e6243b3a57 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1583,10 +1583,14 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
}
if (!isInCurrentRoom()) {
- _pos.x = abr.x;
- _pos.y = abr.y;
- if (!(_vm->_version == 6 && _ignoreTurns) && dir != -1)
- setDirection(dir);
+ if (_vm->_version <= 6) {
+ _pos.x = abr.x;
+ _pos.y = abr.y;
+ if (_ignoreTurns == false && dir != -1)
+ _facing = dir;
+ } else {
+ debug(0, "startWalkActor: attempting to walk actor %d who is not in this room", _number);
+ }
return;
}