From 7a7eabb139687dd1de434f13b4b622693e6db06e Mon Sep 17 00:00:00 2001
From: Sylvain Dupont
Date: Sun, 10 Oct 2010 14:27:19 +0000
Subject: TOON: Fix end of idle animations

svn-id: r53118
---
 engines/toon/character.cpp | 12 ++++--------
 1 file 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) {
-- 
cgit v1.2.3