diff options
author | Vladimir Menshakov | 2009-09-15 20:58:30 +0000 |
---|---|---|
committer | Vladimir Menshakov | 2009-09-15 20:58:30 +0000 |
commit | 62ea7be0cfa462b5aab6a1c63fce67e4499c62a6 (patch) | |
tree | 7d4b574a82a556155e6a6426c0ca0abe422574d7 | |
parent | fc125a5abb5f5cbe814889d68c984d3f1456f342 (diff) | |
download | scummvm-rg350-62ea7be0cfa462b5aab6a1c63fce67e4499c62a6.tar.gz scummvm-rg350-62ea7be0cfa462b5aab6a1c63fce67e4499c62a6.tar.bz2 scummvm-rg350-62ea7be0cfa462b5aab6a1c63fce67e4499c62a6.zip |
fixed animation pausing/restarting when only one of animations present
svn-id: r44111
-rw-r--r-- | engines/teenagent/dialog.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/teenagent/dialog.cpp b/engines/teenagent/dialog.cpp index 2b5efd7092..a968d0e298 100644 --- a/engines/teenagent/dialog.cpp +++ b/engines/teenagent/dialog.cpp @@ -66,27 +66,28 @@ void Dialog::show(Scene *scene, uint16 addr, uint16 animation1, uint16 animation case 2: //debug(0, "displaymessage\n"); - if (color == color2 && animation2 != 0) { + if (color == color2) { + //pause animation in other slot - { + if (animation1 != 0) { SceneEvent e(SceneEvent::kPauseAnimation); e.lan = 0x80 | slot1; scene->push(e); } - { + if (animation2 != 0) { SceneEvent e(SceneEvent::kPlayAnimation); e.animation = animation2; e.lan = 0x80 | slot2; scene->push(e); } - } else if (color == color1 && animation1 != 0) { + } else if (color == color1) { //pause animation in other slot - { + if (animation2 != 0) { SceneEvent e(SceneEvent::kPauseAnimation); e.lan = 0x80 | slot2; scene->push(e); } - { + if (animation1 != 0) { SceneEvent e(SceneEvent::kPlayAnimation); e.animation = animation1; e.lan = 0x80 | slot1; |