diff options
| -rw-r--r-- | engines/scumm/actor.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index eaf9a89da2..8319c61a80 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -810,19 +810,18 @@ void Actor::showActor() { _vm->ensureResourceLoaded(rtCostume, _costume); - if (_costumeNeedsInit) { + if (_vm->_game.version <= 2) { + _cost.reset(); + startAnimActor(_standFrame); startAnimActor(_initFrame); - if (_vm->_game.version <= 2) { - startAnimActor(_standFrame); - startAnimActor(_talkStopFrame); + startAnimActor(_talkStopFrame); + } else { + if (_costumeNeedsInit) { + startAnimActor(_initFrame); + _costumeNeedsInit = false; } - _costumeNeedsInit = false; } - // FIXME: Evil hack to work around bug #770717 - if (!_moving && _vm->_game.version <= 2) - startAnimActor(_standFrame); - stopActorMoving(); _visible = true; _needRedraw = true; |