aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMarisa-Chan2014-02-24 20:40:20 +0700
committerMarisa-Chan2014-02-24 20:40:20 +0700
commit226ccb0de7ed702d4b41625c8a2211fac9cc0787 (patch)
tree9ec63357485cba4e55f894480eef3f0bc5458f35 /engines
parent6210ead126ea81727e6a68398366c4cbe8da9e79 (diff)
downloadscummvm-rg350-226ccb0de7ed702d4b41625c8a2211fac9cc0787.tar.gz
scummvm-rg350-226ccb0de7ed702d4b41625c8a2211fac9cc0787.tar.bz2
scummvm-rg350-226ccb0de7ed702d4b41625c8a2211fac9cc0787.zip
ZVISION: Don't add new timer if sidefx with same key exist
Diffstat (limited to 'engines')
-rw-r--r--engines/zvision/actions.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 7b9050f47a..c3f85fe247 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -607,6 +607,8 @@ ActionTimer::~ActionTimer() {
}
bool ActionTimer::execute() {
+ if (_engine->getScriptManager()->getSideFX(_slotkey))
+ return true;
_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _slotkey, _time->getValue()));
return true;
}