diff options
| author | Sylvain Dupont | 2010-10-22 23:35:56 +0000 |
|---|---|---|
| committer | Sylvain Dupont | 2010-10-22 23:35:56 +0000 |
| commit | 3fb739f90a67c96abf3a3025487bb509b829fa22 (patch) | |
| tree | 863fb034d139388a14bf6f5b39ddc5ff138061d2 /engines/toon | |
| parent | 9f2e7d5ff5c2e416cb1638d67ead9c52ba27fc21 (diff) | |
| download | scummvm-rg350-3fb739f90a67c96abf3a3025487bb509b829fa22.tar.gz scummvm-rg350-3fb739f90a67c96abf3a3025487bb509b829fa22.tar.bz2 scummvm-rg350-3fb739f90a67c96abf3a3025487bb509b829fa22.zip | |
TOON: Fix conversation freeze in the beginning of chapter 2
A missing talk animation was started
svn-id: r53723
Diffstat (limited to 'engines/toon')
| -rw-r--r-- | engines/toon/character.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp index 4daa3a5fa7..f6e244a064 100644 --- a/engines/toon/character.cpp +++ b/engines/toon/character.cpp @@ -967,7 +967,7 @@ void Character::playAnim(int32 animId, int32 unused, int32 flags) { _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); } } |