aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Crossfield2012-01-28 00:25:30 +1100
committerTobias Gunkel2012-02-11 08:29:35 +0100
commit5accf01881424e10e1700bf36c4b8236ed200258 (patch)
tree88338ac5594db92c2888e2eb5f7fa4f59bcc17a0
parentf299fc295e620a71d5fbb783b549b10807c97b99 (diff)
downloadscummvm-rg350-5accf01881424e10e1700bf36c4b8236ed200258.tar.gz
scummvm-rg350-5accf01881424e10e1700bf36c4b8236ed200258.tar.bz2
scummvm-rg350-5accf01881424e10e1700bf36c4b8236ed200258.zip
SCUMM: Remove unnecessary calls to animateActor
-rw-r--r--engines/scumm/actor.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index c22fc8a438..95b7f90318 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -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;
@@ -909,7 +906,7 @@ void ActorC64::setDirection(int direction) {
_animFrameRepeat = -1;
animateActor(res);
- if(_moving & MF_TURN)
+ if(_moving)
animateCostume();
}
@@ -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) {