libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug - ZAK FM-TOWNS: Actor (Caponian) picks wrong line

Browse Source 
svn-id: r23586
This commit is contained in:
Travis Howell 2006-07-24 10:52:14 +00:00
parent c32076e5d0
commit 100b809836
1 changed files with 8 additions and 13 deletions

21
engines/scumm/actor.cpp

@ -1639,7 +1639,8 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
}
if (_pos.x == abr.x && _pos.y == abr.y) {
turnToDirection(dir);
if (dir != _facing)
turnToDirection(dir);
return;
}
@ -1713,10 +1714,8 @@ void Actor::walkActor() {
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 @@ void Actor::walkActorV12() {
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 @@ void Actor::walkActorOld() {
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;
}