diff options
author | Eugene Sandulenko | 2017-03-10 09:00:35 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2017-03-10 09:00:35 +0100 |
commit | 3c08904e5f4fe6c3d9dc9cf35cfed2d63aaa46e5 (patch) | |
tree | cae4e5c4434c5f093a2caafcdab0ea710bec5522 /engines | |
parent | 3e1d298a61071709a40a0fd96c774a28602df5d2 (diff) | |
download | scummvm-rg350-3c08904e5f4fe6c3d9dc9cf35cfed2d63aaa46e5.tar.gz scummvm-rg350-3c08904e5f4fe6c3d9dc9cf35cfed2d63aaa46e5.tar.bz2 scummvm-rg350-3c08904e5f4fe6c3d9dc9cf35cfed2d63aaa46e5.zip |
DIRECTOR: Fixed global even handlers calling
Handlers defined via 'when ...', should stay at global level
Diffstat (limited to 'engines')
-rw-r--r-- | engines/director/events.cpp | 3 | ||||
-rw-r--r-- | engines/director/score.cpp | 3 | ||||
-rw-r--r-- | engines/director/score.h | 3 |
3 files changed, 6 insertions, 3 deletions
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); |