diff options
| author | Johannes Schickel | 2006-05-21 15:41:32 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-05-21 15:41:32 +0000 |
| commit | ef6645c5ba9d87e888516df457e4d72cf9b0a2cf (patch) | |
| tree | f2a56cc8f26851a7acb5fb9dcf85daebeaf77ed1 /engines/kyra/gui.cpp | |
| parent | c47dadeb1f385df7d8f411f9a2a8c7c26450f739 (diff) | |
| download | scummvm-rg350-ef6645c5ba9d87e888516df457e4d72cf9b0a2cf.tar.gz scummvm-rg350-ef6645c5ba9d87e888516df457e4d72cf9b0a2cf.tar.bz2 scummvm-rg350-ef6645c5ba9d87e888516df457e4d72cf9b0a2cf.zip | |
- reworks quit handling (no _system->quit() anymore)
- fixes some deinitalization problems
svn-id: r22558
Diffstat (limited to 'engines/kyra/gui.cpp')
| -rw-r--r-- | engines/kyra/gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index c1ac512922..0e2ac3b076 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -529,7 +529,7 @@ int KyraEngine::buttonMenuCallback(Button *caller) { processAllMenuButtons(); } - while (_displayMenu) { + while (_displayMenu && !_quitFlag) { gui_processHighlights(_menu[_toplevelMenu]); processButtonList(_menuButtonList); gui_getInput(); @@ -830,7 +830,7 @@ int KyraEngine::gui_saveGameMenu(Button *button) { _displaySubMenu = true; _cancelSubMenu = false; - while (_displaySubMenu) { + while (_displaySubMenu && !_quitFlag) { gui_getInput(); gui_processHighlights(_menu[2]); processButtonList(_menuButtonList); @@ -874,7 +874,7 @@ int KyraEngine::gui_loadGameMenu(Button *button) { _displaySubMenu = true; _cancelSubMenu = false; - while (_displaySubMenu) { + while (_displaySubMenu && !_quitFlag) { gui_getInput(); gui_processHighlights(_menu[2]); processButtonList(_menuButtonList); @@ -958,7 +958,7 @@ int KyraEngine::gui_saveGame(Button *button) { } gui_redrawTextfield(); - while (_displaySubMenu) { + while (_displaySubMenu && !_quitFlag) { gui_getInput(); gui_updateSavegameString(); gui_processHighlights(_menu[3]); @@ -1032,7 +1032,7 @@ bool KyraEngine::gui_quitConfirm(const char *str) { _displaySubMenu = true; _cancelSubMenu = true; - while (_displaySubMenu) { + while (_displaySubMenu && !_quitFlag) { gui_getInput(); gui_processHighlights(_menu[1]); processButtonList(_menuButtonList); @@ -1096,7 +1096,7 @@ int KyraEngine::gui_gameControlsMenu(Button *button) { _displaySubMenu = true; _cancelSubMenu = false; - while (_displaySubMenu) { + while (_displaySubMenu && !_quitFlag) { gui_getInput(); gui_processHighlights(_menu[5]); processButtonList(_menuButtonList); |