[Scummvm-cvs-logs] SF.net SVN: scummvm: [23587] scummvm/branches/branch-0-9-0/engines/scumm/actor.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Mon Jul 24 12:52:41 CEST 2006
Revision: 23587
Author: kirben
Date: 2006-07-24 03:52:37 -0700 (Mon, 24 Jul 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23587&view=rev
Log Message:
-----------
Fix bug #1527630 - ZAK FM-TOWNS: Actor (Caponian) picks wrong line
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/engines/scumm/actor.cpp
Modified: scummvm/branches/branch-0-9-0/engines/scumm/actor.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/actor.cpp 2006-07-24 10:52:14 UTC (rev 23586)
+++ scummvm/branches/branch-0-9-0/engines/scumm/actor.cpp 2006-07-24 10:52:37 UTC (rev 23587)
@@ -1625,7 +1625,8 @@
}
if (_pos.x == abr.x && _pos.y == abr.y) {
- turnToDirection(dir);
+ if (dir != _facing)
+ turnToDirection(dir);
return;
}
@@ -1699,10 +1700,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);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list