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

[sylvaintv at users.sourceforge.net]

Revision: 53723
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53723&view=rev
Author:   sylvaintv
Date:     2010-10-22 23:35:56 +0000 (Fri, 22 Oct 2010)

Log Message:
-----------
TOON: Fix conversation freeze in the beginning of chapter 2

A missing talk animation was started

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

Modified: scummvm/trunk/engines/toon/character.cpp
===================================================================
--- scummvm/trunk/engines/toon/character.cpp	2010-10-22 23:33:56 UTC (rev 53722)
+++ scummvm/trunk/engines/toon/character.cpp	2010-10-22 23:35:56 UTC (rev 53723)
@@ -967,7 +967,7 @@
 		_flags |= 1;
 
 		// wait for the character to be ready
-		while (_animScriptId != -1 && _animationInstance->getFrame() > 0 && _animationInstance->getAnimation() != _specialAnim) {
+		while (_animScriptId != -1 && _animationInstance->getFrame() > 0 && (_specialAnim && _animationInstance->getAnimation() != _specialAnim)) {
 			_vm->simpleUpdate(false);
 		}
 	}


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