[Scummvm-cvs-logs] SF.net SVN: scummvm: [20594] scummvm/trunk/engines/scumm/actor.cpp

[kirben at users.sourceforge.net]

Revision: 20594
Author:   kirben
Date:     2006-02-11 22:43:42 -0800 (Sat, 11 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20594&view=rev

Log Message:
-----------
A few corrections from disasm., checked against all versions

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.cpp
Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2006-02-12 04:43:27 UTC (rev 20593)
+++ scummvm/trunk/engines/scumm/actor.cpp	2006-02-12 06:43:42 UTC (rev 20594)
@@ -1583,10 +1583,14 @@
 	}
 
 	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;
 	}