aboutsummaryrefslogtreecommitdiff
path: root/engines/director/lingo
diff options
context:
space:
mode:
authorTobia Tesan2017-06-21 00:47:54 +0200
committerEugene Sandulenko2017-07-05 08:35:33 +0200
commitfd310f1fd3b8336b7c9a2b771153e22a006a4e52 (patch)
tree6b863ec2319521365bec5429054469722af136a3 /engines/director/lingo
parentf1d2149db6b5da2a873f457a4d4687d8bcd1a908 (diff)
downloadscummvm-rg350-fd310f1fd3b8336b7c9a2b771153e22a006a4e52.tar.gz
scummvm-rg350-fd310f1fd3b8336b7c9a2b771153e22a006a4e52.tar.bz2
scummvm-rg350-fd310f1fd3b8336b7c9a2b771153e22a006a4e52.zip
DIRECTOR: Move executeImmediateScripts to lingo.cpp
Diffstat (limited to 'engines/director/lingo')
-rw-r--r--engines/director/lingo/lingo.cpp8
-rw-r--r--engines/director/lingo/lingo.h3
2 files changed, 11 insertions, 0 deletions
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index d21936205a..77c0bbcb9d 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -404,4 +404,12 @@ void Lingo::runTests() {
}
}
+void Lingo::executeImmediateScripts(Frame *frame) {
+ for (uint16 i = 0; i < CHANNEL_COUNT; i++) {
+ if (_vm->getCurrentScore()->_immediateActions.contains(frame->_sprites[i]->_scriptId)) {
+ g_lingo->processEvent(kEventMouseUp, kFrameScript, frame->_sprites[i]->_scriptId);
+ }
+ }
+}
+
} // End of namespace Director
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index c17473f4ea..0d0c56cd92 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -579,6 +579,9 @@ private:
int _floatPrecision;
bool dontPassEvent;
+
+public:
+ void executeImmediateScripts(Frame *frame);
};
extern Lingo *g_lingo;