diff options
| author | Paul Gilbert | 2011-12-18 21:07:31 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-12-18 21:08:53 +1100 |
| commit | 8385ee1c012af3f2d62cfa098aab7254c4e559b0 (patch) | |
| tree | 4ec381c51e1ec53cef265616aeb18cac0f4d479b /engines/tsage | |
| parent | 421c8cd2624a9e8ac2f0091ef1b51b42f99dae26 (diff) | |
| download | scummvm-rg350-8385ee1c012af3f2d62cfa098aab7254c4e559b0.tar.gz scummvm-rg350-8385ee1c012af3f2d62cfa098aab7254c4e559b0.tar.bz2 scummvm-rg350-8385ee1c012af3f2d62cfa098aab7254c4e559b0.zip | |
TSAGE: Bugfix for using save/load buttons in the Blue Force options dialog
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/blue_force/blueforce_dialogs.cpp | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp index 6f294d263a..11c0358aca 100644 --- a/engines/tsage/blue_force/blueforce_dialogs.cpp +++ b/engines/tsage/blue_force/blueforce_dialogs.cpp @@ -166,6 +166,9 @@ void RightClickDialog::execute() { GLOBALS._screenSurface.copyToScreen(); } + // Deactivate the graphics manager used for the dialog + _gfxManager.deactivate(); + // Execute the specified action CursorType cursorNum = CURSOR_NONE; switch (_selectedAction) { @@ -193,8 +196,6 @@ void RightClickDialog::execute() { if (cursorNum != CURSOR_NONE) BF_GLOBALS._events.setCursor(cursorNum); - - _gfxManager.deactivate(); } /*--------------------------------------------------------------------------*/ @@ -435,29 +436,45 @@ void OptionsDialog::show() { OptionsDialog *dlg = new OptionsDialog(); dlg->draw(); + // Show the dialog GfxButton *btn = dlg->execute(); - if (btn == &dlg->_btnQuit) { + // Get which button was pressed + int btnIndex = -1; + if (btn == &dlg->_btnRestore) + btnIndex = 0; + else if (btn == &dlg->_btnSave) + btnIndex = 1; + else if (btn == &dlg->_btnRestart) + btnIndex = 2; + else if (btn == &dlg->_btnQuit) + btnIndex = 3; + else if (btn == &dlg->_btnSound) + btnIndex = 4; + + // Close the dialog + dlg->remove(); + delete dlg; + + // Execute the given selection + if (btnIndex == 0) { + // Restore button + g_globals->_game->restoreGame(); + } else if (btnIndex == 1) { + // Save button + g_globals->_game->saveGame(); + } else if (btnIndex == 2) { + // Restart game + g_globals->_game->restartGame(); + } else if (btnIndex == 3) { // Quit game if (MessageDialog::show(QUIT_CONFIRM_MSG, CANCEL_BTN_STRING, QUIT_BTN_STRING) == 1) { g_vm->quitGame(); } - } else if (btn == &dlg->_btnRestart) { - // Restart game - g_globals->_game->restartGame(); - } else if (btn == &dlg->_btnSound) { + } else if (btnIndex == 4) { // Sound dialog SoundDialog::execute(); - } else if (btn == &dlg->_btnSave) { - // Save button - g_globals->_game->saveGame(); - } else if (btn == &dlg->_btnRestore) { - // Restore button - g_globals->_game->restoreGame(); } - - dlg->remove(); - delete dlg; } OptionsDialog::OptionsDialog() { |