aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/scene.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-05-01 09:17:10 -0400
committerPaul Gilbert2014-05-01 09:17:10 -0400
commit88cf2c7caab3ce74460a980640b9fe832f4fba5f (patch)
tree8824bf0dc61a5bfc7b868e47887f37110504bc92 /engines/mads/scene.cpp
parent57bf0673d70311da7b2bddda91f4a0566c51c340 (diff)
downloadscummvm-rg350-88cf2c7caab3ce74460a980640b9fe832f4fba5f.tar.gz
scummvm-rg350-88cf2c7caab3ce74460a980640b9fe832f4fba5f.tar.bz2
scummvm-rg350-88cf2c7caab3ce74460a980640b9fe832f4fba5f.zip
MADS: Fix actions being triggered at the end of animation sequences
Diffstat (limited to 'engines/mads/scene.cpp')
-rw-r--r--engines/mads/scene.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index f4b2cb1ec8..5c86e4590e 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -594,7 +594,7 @@ void Scene::checkKeyboard() {
}
}
-void Scene::loadAnimation(const Common::String &resName, int abortTimers) {
+void Scene::loadAnimation(const Common::String &resName, int trigger) {
assert(_activeAnimation == nullptr);
MSurface depthSurface;
UserInterface interfaceSurface(_vm);
@@ -602,7 +602,7 @@ void Scene::loadAnimation(const Common::String &resName, int abortTimers) {
_activeAnimation = Animation::init(_vm, this);
_activeAnimation->load(interfaceSurface, depthSurface, resName,
_vm->_dithering ? ANIMFLAG_DITHER : 0, nullptr, nullptr);
- _activeAnimation->startAnimation(abortTimers);
+ _activeAnimation->startAnimation(trigger);
}
void Scene::updateCursor() {