From 2ae7d9f86bb5956fd0705d413f29dcfa6878b1a8 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 21 Jun 2017 10:20:07 +0200
Subject: DIRECTOR: Handle kEventPrepareMovie with 1-ary processEvent

---
 engines/director/lingo/lingo-events.cpp | 3 ++-
 engines/director/score.cpp              | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines')

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;
-- 
cgit v1.2.3