An actor is completely reset by showActor() in SCUMM1-2 games. Fixes bug #902391

svn-id: r21283
This commit is contained in:
Travis Howell 2006-03-14 13:16:11 +00:00
parent 53c5b8cf47
commit 4f10a71b98

View File

@ -810,18 +810,17 @@ void Actor::showActor() {
_vm->ensureResourceLoaded(rtCostume, _costume);
if (_costumeNeedsInit) {
startAnimActor(_initFrame);
if (_vm->_game.version <= 2) {
startAnimActor(_standFrame);
startAnimActor(_talkStopFrame);
}
_costumeNeedsInit = false;
}
// FIXME: Evil hack to work around bug #770717
if (!_moving && _vm->_game.version <= 2)
if (_vm->_game.version <= 2) {
_cost.reset();
startAnimActor(_standFrame);
startAnimActor(_initFrame);
startAnimActor(_talkStopFrame);
} else {
if (_costumeNeedsInit) {
startAnimActor(_initFrame);
_costumeNeedsInit = false;
}
}
stopActorMoving();
_visible = true;