diff options
| author | Christopher Page | 2008-07-07 22:34:45 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-07 22:34:45 +0000 |
| commit | a4f56de13ac2a7daaf5654c75f07ad6331f375e6 (patch) | |
| tree | 8a000a805fef0d628eaeb9d662daf0649a785ffe /engines/agos/event.cpp | |
| parent | b50df858eb52520b529597d98fcd0d9b29619930 (diff) | |
| download | scummvm-rg350-a4f56de13ac2a7daaf5654c75f07ad6331f375e6.tar.gz scummvm-rg350-a4f56de13ac2a7daaf5654c75f07ad6331f375e6.tar.bz2 scummvm-rg350-a4f56de13ac2a7daaf5654c75f07ad6331f375e6.zip | |
Implemented Common::EventManager::pushEvent() to insert fake events into the event queue. Quit and RTL events have been added, and are now tracked by the DefaultEventManager using shouldQuit() and shouldRTL(). AGOS is working with this new implementation, other engines to follow.
svn-id: r32952
Diffstat (limited to 'engines/agos/event.cpp')
| -rw-r--r-- | engines/agos/event.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 010b331cf8..4a362d420a 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -142,7 +142,7 @@ bool AGOSEngine::kickoffTimeEvents() { cur_time = getTime() - _gameStoppedClock; - while ((te = _firstTimeStruct) != NULL && te->time <= cur_time && !_quit) { + while ((te = _firstTimeStruct) != NULL && te->time <= cur_time && !_eventMan->shouldQuit()) { result = true; _pendingDeleteTimeEvent = te; invokeTimeEvent(te); @@ -521,7 +521,6 @@ void AGOSEngine::delay(uint amount) { _rightButtonDown++; break; case Common::EVENT_QUIT: - _quit = true; return; default: break; @@ -544,7 +543,7 @@ void AGOSEngine::delay(uint amount) { _system->delayMillis(this_delay); cur = _system->getMillis(); - } while (cur < start + amount && !_quit); + } while (cur < start + amount && !_eventMan->shouldQuit()); } void AGOSEngine::timer_callback() { |