diff options
| author | Sylvain Dupont | 2010-10-10 14:27:19 +0000 |
|---|---|---|
| committer | Sylvain Dupont | 2010-10-10 14:27:19 +0000 |
| commit | 7a7eabb139687dd1de434f13b4b622693e6db06e (patch) | |
| tree | 07d3e79ded4a205f7913b52578c77809f6b46ad6 /engines/toon | |
| parent | 2c691e1168b6ebc667b32a4f2b18f3bba17b7146 (diff) | |
| download | scummvm-rg350-7a7eabb139687dd1de434f13b4b622693e6db06e.tar.gz scummvm-rg350-7a7eabb139687dd1de434f13b4b622693e6db06e.tar.bz2 scummvm-rg350-7a7eabb139687dd1de434f13b4b622693e6db06e.zip | |
TOON: Fix end of idle animations
svn-id: r53118
Diffstat (limited to 'engines/toon')
| -rw-r--r-- | engines/toon/character.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp index c0612b5f00..17027a1bee 100644 --- a/engines/toon/character.cpp +++ b/engines/toon/character.cpp @@ -246,21 +246,17 @@ void Character::stopSpecialAnim() { if (_sceneAnimationId != -1) _animationInstance->setAnimation(_vm->getSceneAnimation(_sceneAnimationId)->_animation); + bool needStandingAnim = (_animFlags & 0x40) != 0; + _animSpecialId = -1; _time = 0; _animFlags = 0; _flags &= ~1; _flags &= ~4; - - // end of idle animation - if (_animFlags & 0x40) { + + if (needStandingAnim) { playStandingAnim(); } - -#if 0 - _animationInstance->setFrame(0); - playStandingAnim(); -#endif } void Character::update(int32 timeIncrement) { |