diff options
| -rw-r--r-- | engines/macventure/gui.cpp | 2 | ||||
| -rw-r--r-- | engines/macventure/macventure.cpp | 16 | ||||
| -rw-r--r-- | engines/macventure/macventure.h | 1 |
3 files changed, 12 insertions, 7 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp index 6c8122d156..2c2e4b5281 100644 --- a/engines/macventure/gui.cpp +++ b/engines/macventure/gui.cpp @@ -876,7 +876,7 @@ void Gui::saveGame() { } void Gui::newGame() { - warning("New Game not implemented!"); + _engine->newGame(); } void Gui::quitGame() { diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp index a1b2387a87..b3b3463cf5 100644 --- a/engines/macventure/macventure.cpp +++ b/engines/macventure/macventure.cpp @@ -182,9 +182,9 @@ Common::Error MacVentureEngine::run() { while (_gameState != kGameStateQuitting) { processEvents(); - if (_gameState != kGameStateQuitting) { + if (_gameState != kGameStateQuitting && !_gui->isDialogOpen()) { - if (_prepared && !_gui->isDialogOpen()) { + if (_prepared) { _prepared = false; if (!_halted) @@ -207,16 +207,20 @@ Common::Error MacVentureEngine::run() { endGame(); } } - _gui->draw(); - - g_system->updateScreen(); - g_system->delayMillis(50); } + _gui->draw(); + + g_system->updateScreen(); + g_system->delayMillis(50); } return Common::kNoError; } +void MacVentureEngine::newGame() { + warning("New Game not implemented!"); +} + void MacVentureEngine::reset() { resetInternals(); resetGui(); diff --git a/engines/macventure/macventure.h b/engines/macventure/macventure.h index e9d4e12bfc..576fd9b323 100644 --- a/engines/macventure/macventure.h +++ b/engines/macventure/macventure.h @@ -184,6 +184,7 @@ public: bool canSaveGameStateCurrently(); virtual Common::Error loadGameState(int slot); virtual Common::Error saveGameState(int slot, const Common::String &desc); + void newGame(); void initDebugChannels(); |