aboutsummaryrefslogtreecommitdiff
path: root/engines/director
diff options
context:
space:
mode:
authorTobia Tesan2017-06-21 10:20:07 +0200
committerEugene Sandulenko2017-07-05 08:35:33 +0200
commit2ae7d9f86bb5956fd0705d413f29dcfa6878b1a8 (patch)
tree314b06ed0f4b9f2aa31c75ce6adf74aa6e7b877c /engines/director
parent9ddb97b4edf5be70233b0ec84cd7dea47329aa26 (diff)
downloadscummvm-rg350-2ae7d9f86bb5956fd0705d413f29dcfa6878b1a8.tar.gz
scummvm-rg350-2ae7d9f86bb5956fd0705d413f29dcfa6878b1a8.tar.bz2
scummvm-rg350-2ae7d9f86bb5956fd0705d413f29dcfa6878b1a8.zip
DIRECTOR: Handle kEventPrepareMovie with 1-ary processEvent
Diffstat (limited to 'engines/director')
-rw-r--r--engines/director/lingo/lingo-events.cpp3
-rw-r--r--engines/director/score.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index 7342bffebd..1dc131eb89 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -233,7 +233,7 @@ void Lingo::processFrameEvent(LEvent event) {
void Lingo::processGenericEvent(LEvent event) {
// Movie Script
int id = -1;
- if (event == kEventStart)
+ if (event == kEventStart || event == kEventPrepareMovie)
id = 0;
else
warning("STUB: processGenericEvent called for something else than kEventStart or kEventPrepareMovie, additional logic probably needed");
@@ -275,6 +275,7 @@ void Lingo::processEvent(LEvent event) {
case kEventStartMovie:
case kEventStopMovie:
case kEventTimeout:
+ case kEventPrepareMovie:
processGenericEvent(event);
break;
case kEventBeginSprite:
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 9371cbae76..64a44793a7 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -72,8 +72,6 @@ Score::Score(DirectorEngine *vm) {
if (_vm->getVersion() <= 3) {
_lingo->executeScript(kMovieScript, 0);
}
-
- _lingo->processEvent(kEventPrepareMovie, kMovieScript, 0);
_movieScriptCount = 0;
_labels = NULL;
_font = NULL;