[Scummvm-cvs-logs] SF.net SVN: scummvm:[53118] scummvm/trunk/engines/toon/character.cpp

[sylvaintv at users.sourceforge.net]

Revision: 53118
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53118&view=rev
Author:   sylvaintv
Date:     2010-10-10 14:27:19 +0000 (Sun, 10 Oct 2010)

Log Message:
-----------
TOON: Fix end of idle animations

Modified Paths:
--------------
    scummvm/trunk/engines/toon/character.cpp

Modified: scummvm/trunk/engines/toon/character.cpp
===================================================================
--- scummvm/trunk/engines/toon/character.cpp	2010-10-10 14:22:10 UTC (rev 53117)
+++ scummvm/trunk/engines/toon/character.cpp	2010-10-10 14:27:19 UTC (rev 53118)
@@ -246,21 +246,17 @@
 	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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.