diff options
author | Christopher Page | 2008-07-10 22:34:48 +0000 |
---|---|---|
committer | Christopher Page | 2008-07-10 22:34:48 +0000 |
commit | 17ce8db211051bf0b7626958201b5bcfec206979 (patch) | |
tree | 2b7b2f476c21e49fb8f36fd752a991210bd60870 /engines/lure/game.cpp | |
parent | 1fd613afa681fc3a81d9ed3f5c6fb34513ca2fd7 (diff) | |
download | scummvm-rg350-17ce8db211051bf0b7626958201b5bcfec206979.tar.gz scummvm-rg350-17ce8db211051bf0b7626958201b5bcfec206979.tar.bz2 scummvm-rg350-17ce8db211051bf0b7626958201b5bcfec206979.zip |
Lure works with the new GMM implementation
svn-id: r32996
Diffstat (limited to 'engines/lure/game.cpp')
-rw-r--r-- | engines/lure/game.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index e8ac2ead88..195ad0fd66 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -143,7 +143,7 @@ void Game::execute() { setState(GS_RESTART); bool initialRestart = true; - while (!engine._quit) { + while (!engine.quit()) { if ((_state & GS_RESTART) != 0) { res.reset(); @@ -163,7 +163,7 @@ void Game::execute() { mouse.cursorOn(); // Main game loop - while (!engine._quit && ((_state & GS_RESTART) == 0)) { + while (!engine.quit() && ((_state & GS_RESTART) == 0)) { // If time for next frame, allow everything to update if (system.getMillis() > timerVal + GAME_FRAME_DELAY) { timerVal = system.getMillis(); @@ -292,10 +292,7 @@ void Game::execute() { if (restartFlag) setState(GS_RESTART); - - } else if ((_state & GS_RESTART) == 0) - // Exiting game - engine._quit = true; + } } } @@ -893,7 +890,7 @@ void Game::doShowCredits() { void Game::doQuit() { Sound.pause(); if (getYN()) - LureEngine::getReference()._quit = true; + LureEngine::getReference().quitGame(); Sound.resume(); } @@ -1020,7 +1017,7 @@ bool Game::getYN() { } g_system->delayMillis(10); - } while (!engine._quit && !breakFlag); + } while (!engine.quit() && !breakFlag); screen.update(); if (!vKbdFlag) |