aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Menshakov2009-11-10 07:29:06 +0000
committerVladimir Menshakov2009-11-10 07:29:06 +0000
commitc51674200b6f3a77eccfe0fe5ef9d5dff14d46a8 (patch)
tree4737c6720097711d196cad7b6de79e16f7ccf5c2
parente2ca397e63861b256d50ba5ea9550db3ac4421e5 (diff)
downloadscummvm-rg350-c51674200b6f3a77eccfe0fe5ef9d5dff14d46a8.tar.gz
scummvm-rg350-c51674200b6f3a77eccfe0fe5ef9d5dff14d46a8.tar.bz2
scummvm-rg350-c51674200b6f3a77eccfe0fe5ef9d5dff14d46a8.zip
added special animation 0 case
svn-id: r45800
-rw-r--r--engines/teenagent/scene.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp
index 4382655799..48e0df5fe5 100644
--- a/engines/teenagent/scene.cpp
+++ b/engines/teenagent/scene.cpp
@@ -672,8 +672,13 @@ bool Scene::processEventQueue() {
break;
case SceneEvent::kPlayAnimation:
- debug(0, "playing animation %u in slot %u", current_event.animation, current_event.slot & 3);
- playAnimation(current_event.slot & 3, current_event.animation, (current_event.slot & 0x80) != 0, (current_event.slot & 0x40) != 0, (current_event.slot & 0x20) != 0);
+ if (current_event.animation != 0) {
+ debug(0, "playing animation %u in slot %u", current_event.animation, current_event.slot & 3);
+ playAnimation(current_event.slot & 3, current_event.animation, (current_event.slot & 0x80) != 0, (current_event.slot & 0x40) != 0, (current_event.slot & 0x20) != 0);
+ } else {
+ debug(0, "cancelling animation in slot %u", current_event.slot & 3);
+ custom_animation[current_event.slot & 3].free();
+ }
current_event.clear();
break;