diff options
author | Christopher Page | 2008-07-09 02:27:05 +0000 |
---|---|---|
committer | Christopher Page | 2008-07-09 02:27:05 +0000 |
commit | e808cdf7a08d641389ecc81063b3b1016c7bc8cf (patch) | |
tree | dd21fa0f4b624d426675820b318aa3e41707c3ca /engines/agos/event.cpp | |
parent | b8fe71e7a12e60f0c19fa86da83f270dc09e14fd (diff) | |
download | scummvm-rg350-e808cdf7a08d641389ecc81063b3b1016c7bc8cf.tar.gz scummvm-rg350-e808cdf7a08d641389ecc81063b3b1016c7bc8cf.tar.bz2 scummvm-rg350-e808cdf7a08d641389ecc81063b3b1016c7bc8cf.zip |
Reimplemented pushEvent() and artificialEventQueue to work with Events instead of EventTypes. Reimplemented Queue as a List instead of Array. Updated AGOS, AGI, CINE, GOB, and KYRA to work with the current implementation of the GMM
svn-id: r32971
Diffstat (limited to 'engines/agos/event.cpp')
-rw-r--r-- | engines/agos/event.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 4a362d420a..5082db84be 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 && !_eventMan->shouldQuit()) { + while ((te = _firstTimeStruct) != NULL && te->time <= cur_time && !quit()) { result = true; _pendingDeleteTimeEvent = te; invokeTimeEvent(te); @@ -543,7 +543,7 @@ void AGOSEngine::delay(uint amount) { _system->delayMillis(this_delay); cur = _system->getMillis(); - } while (cur < start + amount && !_eventMan->shouldQuit()); + } while (cur < start + amount && !quit()); } void AGOSEngine::timer_callback() { |