diff options
| author | Johannes Schickel | 2008-05-10 19:41:26 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-10 19:41:26 +0000 |
| commit | d21d9858fd33a56983eb89b662db2b27fead3ce5 (patch) | |
| tree | c9c5b8a5e12e5a4fc9950d1b05d5ac785c8915c4 /engines/kyra/kyra_mr.cpp | |
| parent | 5082419fe9957ca144904fe2cdb3e86ff7b36e1f (diff) | |
| download | scummvm-rg350-d21d9858fd33a56983eb89b662db2b27fead3ce5.tar.gz scummvm-rg350-d21d9858fd33a56983eb89b662db2b27fead3ce5.tar.bz2 scummvm-rg350-d21d9858fd33a56983eb89b662db2b27fead3ce5.zip | |
- Cleaned up main menu quit handling
- Moved KyraEngine_HoF delay implementation to KyraEngine_v2
svn-id: r31987
Diffstat (limited to 'engines/kyra/kyra_mr.cpp')
| -rw-r--r-- | engines/kyra/kyra_mr.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 481a3d124f..be788f5a64 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -276,6 +276,8 @@ int KyraEngine_MR::go() { delayUntil(nextRun); } + _eventList.clear(); + switch (_menu->handle(3)) { case 2: _menuDirectlyToLoad = true; @@ -1276,19 +1278,6 @@ void KyraEngine_MR::updateMouse() { } } -void KyraEngine_MR::delay(uint32 millis, bool doUpdate, bool isMainLoop) { - debugC(9, kDebugLevelMain, "KyraEngine_MR::delay(%d, %d, %d)", millis, doUpdate, isMainLoop); - uint32 endTime = _system->getMillis() + millis; - while (endTime > _system->getMillis()) { - if (doUpdate) { - //XXX - update(); - } - - _system->delayMillis(10); - } -} - #pragma mark - void KyraEngine_MR::makeCharFacingMouse() { |