From 3c08904e5f4fe6c3d9dc9cf35cfed2d63aaa46e5 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 10 Mar 2017 09:00:35 +0100
Subject: DIRECTOR: Fixed global even handlers calling

Handlers defined via 'when ...', should stay at global level
---
 engines/director/events.cpp | 3 +--
 engines/director/score.cpp  | 3 +++
 engines/director/score.h    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 613e83c352..a4e3f58a59 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -111,8 +111,7 @@ void DirectorEngine::processEvents() {
 					warning("Keycode: %d", _keyCode);
 				}
 
-				// TODO: is movie script correct? Can this be elsewhere?
-				_lingo->processEvent(kEventKeyDown, kMovieScript, 0);
+				_lingo->processEvent(kEventKeyDown, kGlobalScript, 0);
 			}
 		}
 
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 1ba0ab4683..ea3ce9be8c 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -621,6 +621,9 @@ void Score::dumpScript(const char *script, ScriptType type, uint16 id) {
 	case kCastScript:
 		typeName = "cast";
 		break;
+	case kGlobalScript:
+		typeName = "global";
+		break;
 	}
 
 	sprintf(buf, "./dumps/%s-%s-%d.txt", _macName.c_str(), typeName.c_str(), id);
diff --git a/engines/director/score.h b/engines/director/score.h
index 3e7aa62c4f..346a84ce63 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -48,8 +48,9 @@ enum ScriptType {
 	kSpriteScript = 1,
 	kFrameScript = 2,
 	kCastScript = 3,
+	kGlobalScript = 4,
 	kNoneScript = -1,
-	kMaxScriptType = 3
+	kMaxScriptType = 4
 };
 
 const char *scriptType2str(ScriptType scr);
-- 
cgit v1.2.3