diff options
author | Tobia Tesan | 2017-06-21 10:51:06 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2017-07-05 08:35:33 +0200 |
commit | 3059c95abd3944e6e628a32238dca1aeefecadbc (patch) | |
tree | c930ac5b6687b5f55dd4855f6bf2899b23f1679d /engines | |
parent | 137e10eef24785a1e39aaffb6fd992e09bc49531 (diff) | |
download | scummvm-rg350-3059c95abd3944e6e628a32238dca1aeefecadbc.tar.gz scummvm-rg350-3059c95abd3944e6e628a32238dca1aeefecadbc.tar.bz2 scummvm-rg350-3059c95abd3944e6e628a32238dca1aeefecadbc.zip |
DIRECTOR: Handle keyDown in 1-ary processEvent
Might change semantics by calling the standard chain for input events.
That is what the D4 docs suggest anyway.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/director/events.cpp | 2 | ||||
-rw-r--r-- | engines/director/lingo/lingo-events.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/director/events.cpp b/engines/director/events.cpp index 81c80dcc1e..b59202c1f6 100644 --- a/engines/director/events.cpp +++ b/engines/director/events.cpp @@ -110,7 +110,7 @@ void DirectorEngine::processEvents() { warning("Keycode: %d", _keyCode); } - _lingo->processEvent(kEventKeyDown, kGlobalScript, 0); + _lingo->processEvent(kEventKeyDown); break; default: diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp index e1a8cab7ba..15595b53ee 100644 --- a/engines/director/lingo/lingo-events.cpp +++ b/engines/director/lingo/lingo-events.cpp @@ -175,6 +175,10 @@ void Lingo::processInputEvent(LEvent event) { else g_lingo->processEvent(kEventNone, kFrameScript, currentFrame->_sprites[spriteId]->_scriptId); } + if (event == kEventKeyDown) { + // TODO: is the above condition necessary or useful? + g_lingo->processEvent(event, kGlobalScript, 0); + } runMovieScript(event); } } |