Skip to content

Commit

Permalink
SCUMM: Remove unnecessary calls to animateActor
Browse files Browse the repository at this point in the history
  • Loading branch information
segrax authored and tobigun committed Feb 11, 2012
1 parent f299fc2 commit 5accf01
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions engines/scumm/actor.cpp
Expand Up @@ -401,9 +401,6 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
if (_pos.x == abr.x && _pos.y == abr.y && (dir == -1 || _facing == dir))
return;

if( _vm->_game.version == 0 )
((ActorC64*) this)->animateActor( newDirToOldDir( _facing ) );

} else {
if (_ignoreBoxes) {
abr.box = kInvalidBox;
Expand Down Expand Up @@ -909,7 +906,7 @@ void ActorC64::setDirection(int direction) {

_animFrameRepeat = -1;
animateActor(res);
if(_moving & MF_TURN)
if(_moving)
animateCostume();
}

Expand Down Expand Up @@ -1002,11 +999,6 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
if (isInCurrentRoom())
showActor();
}

if( _vm->_game.version == 0 ) {
_moving = 0;
setDirection( oldDirToNewDir(2));
}
}

static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {
Expand Down

0 comments on commit 5accf01

Please sign in to comment.