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

[kirben at users.sourceforge.net]

Revision: 23586
Author:   kirben
Date:     2006-07-24 03:52:14 -0700 (Mon, 24 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23586&view=rev

Log Message:
-----------
Fix bug #1527630 - ZAK FM-TOWNS: Actor (Caponian) picks wrong line

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.cpp
Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2006-07-23 16:13:26 UTC (rev 23585)
+++ scummvm/trunk/engines/scumm/actor.cpp	2006-07-24 10:52:14 UTC (rev 23586)
@@ -1639,7 +1639,8 @@
 	}
 
 	if (_pos.x == abr.x && _pos.y == abr.y) {
-		turnToDirection(dir);
+		if (dir != _facing)
+			turnToDirection(dir);
 		return;
 	}
 
@@ -1713,10 +1714,8 @@
 			setBox(_walkdata.destbox);
 			if (_vm->_game.version <= 6) {
 				startAnimActor(_standFrame);
-				if (!_ignoreTurns && _walkdata.destdir != -1 && _targetFacing != _walkdata.destdir) {
-					_targetFacing = _walkdata.destdir;
-					_moving = MF_TURN;
-				}
+				if (_targetFacing != _walkdata.destdir)
+					turnToDirection(_walkdata.destdir);
 			} else {
 				startWalkAnim(3, _walkdata.destdir);
 			}
@@ -1793,10 +1792,8 @@
 		if (_moving & MF_LAST_LEG) {
 			_moving = 0;
 			startAnimActor(_standFrame);
-			if (_walkdata.destdir != -1 && _targetFacing != _walkdata.destdir) {
-				_targetFacing = _walkdata.destdir;
-				_moving = MF_TURN;
-			}
+			if (_targetFacing != _walkdata.destdir)
+				turnToDirection(_walkdata.destdir);
 		} else {
 			setBox(_walkdata.curbox);
 			if (_walkbox == _walkdata.destbox) {
@@ -1840,10 +1837,8 @@
 		if (_moving & MF_LAST_LEG) {
 			_moving = 0;
 			startAnimActor(_standFrame);
-			if (_walkdata.destdir != -1 && _targetFacing != _walkdata.destdir) {
-				_targetFacing = _walkdata.destdir;
-				_moving = MF_TURN;
-			}
+			if (_targetFacing != _walkdata.destdir)
+				turnToDirection(_walkdata.destdir);
 			return;
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.