From 86ee0df205b267cc3bea1381dbafee8bb85d15ab Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 12 Feb 2006 06:43:42 +0000
Subject: A few corrections from disasm., checked against all versions

svn-id: r20594
---
 engines/scumm/actor.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'engines')

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;
 	}
 
-- 
cgit v1.2.3