diff options
author | Tobia Tesan | 2017-06-21 10:58:13 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2017-07-05 08:35:33 +0200 |
commit | 8a6dce9fd334230ec80b2c444cbddfad2cb429d6 (patch) | |
tree | 62970edd7c2fd78c14321708fe683cc80fda5765 | |
parent | 1d5c92783e2803d4db4c504ec87c327007c0f8a7 (diff) | |
download | scummvm-rg350-8a6dce9fd334230ec80b2c444cbddfad2cb429d6.tar.gz scummvm-rg350-8a6dce9fd334230ec80b2c444cbddfad2cb429d6.tar.bz2 scummvm-rg350-8a6dce9fd334230ec80b2c444cbddfad2cb429d6.zip |
DIRECTOR: Handle kEventIdle with 1-ary processEvent
-rw-r--r-- | engines/director/events.cpp | 2 | ||||
-rw-r--r-- | engines/director/lingo/lingo-events.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/director/events.cpp b/engines/director/events.cpp index b59202c1f6..603582bfc8 100644 --- a/engines/director/events.cpp +++ b/engines/director/events.cpp @@ -122,7 +122,7 @@ void DirectorEngine::processEvents() { g_system->delayMillis(10); if (sc->getCurrentFrame() > 0) - _lingo->processEvent(kEventIdle, kFrameScript, sc->getCurrentFrame()); + _lingo->processEvent(kEventIdle); } } diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp index 65c02490f5..7aabcff28f 100644 --- a/engines/director/lingo/lingo-events.cpp +++ b/engines/director/lingo/lingo-events.cpp @@ -217,7 +217,7 @@ void Lingo::processFrameEvent(LEvent event) { } else { int entity; - if (event == kEventPrepareFrame) { + if (event == kEventPrepareFrame || event == kEventIdle) { entity = score->getCurrentFrame(); } else { assert(score->_frames[score->getCurrentFrame()] != nullptr); @@ -264,6 +264,7 @@ void Lingo::processEvent(LEvent event) { processInputEvent(event); break; + case kEventIdle: case kEventEnterFrame: case kEventExitFrame: processFrameEvent(event); @@ -272,7 +273,6 @@ void Lingo::processEvent(LEvent event) { case kEventStart: case kEventStartMovie: case kEventStopMovie: - case kEventIdle: case kEventTimeout: processGenericEvent(event); break; |