aboutsummaryrefslogtreecommitdiff
path: root/engines/director/lingo
diff options
context:
space:
mode:
authorTobia Tesan2017-06-21 10:56:59 +0200
committerEugene Sandulenko2017-07-05 08:35:33 +0200
commitc267bc208ffed2aef1ef7b7c47ebba070acb4775 (patch)
treee26deee33aa8fdeb606cc619022c136721a25eeb /engines/director/lingo
parent963bc4a35121b6a9efacb5cf57194ee8e5ad23f8 (diff)
downloadscummvm-rg350-c267bc208ffed2aef1ef7b7c47ebba070acb4775.tar.gz
scummvm-rg350-c267bc208ffed2aef1ef7b7c47ebba070acb4775.tar.bz2
scummvm-rg350-c267bc208ffed2aef1ef7b7c47ebba070acb4775.zip
DIRECTOR: Handle kEventPrepareFrame in processFrameEvent
Diffstat (limited to 'engines/director/lingo')
-rw-r--r--engines/director/lingo/lingo-events.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index 573ee521d1..b65e752388 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -205,12 +205,17 @@ void Lingo::processFrameEvent(LEvent event) {
if (g_lingo->dontPassEvent) {
g_lingo->dontPassEvent = false;
} else {
- assert(score->_frames[score->getCurrentFrame()] != nullptr);
- if (!g_lingo->_scripts[kFrameScript].contains(kFrameScript)) {
- processEvent(event,
- kFrameScript,
- score->_frames[score->getCurrentFrame()]->_actionId);
+ int entity;
+
+ if (event == kEventPrepareFrame) {
+ entity = score->getCurrentFrame();
+ } else {
+ assert(score->_frames[score->getCurrentFrame()] != nullptr);
+ entity = score->_frames[score->getCurrentFrame()]->_actionId;
}
+ processEvent(event,
+ kFrameScript,
+ entity);
runMovieScript(event);
}
}