diff options
| author | Bastien Bouclet | 2016-02-20 14:30:17 +0100 |
|---|---|---|
| committer | Bastien Bouclet | 2016-02-22 08:44:55 +0100 |
| commit | c3c09a1c83b24d9c0206d9cbb86a4d6d641232b1 (patch) | |
| tree | bb47cc7ae1b4f2168907d1f186a7f8ed47c37c9d | |
| parent | b12cb7308ab3260e84520b3de2d34dbd6d7cd77d (diff) | |
| download | scummvm-rg350-c3c09a1c83b24d9c0206d9cbb86a4d6d641232b1.tar.gz scummvm-rg350-c3c09a1c83b24d9c0206d9cbb86a4d6d641232b1.tar.bz2 scummvm-rg350-c3c09a1c83b24d9c0206d9cbb86a4d6d641232b1.zip | |
MOHAWK: MystOptionsDialog should not subclass GUI::OptionsDialog
| -rw-r--r-- | engines/mohawk/dialogs.cpp | 14 | ||||
| -rw-r--r-- | engines/mohawk/dialogs.h | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp index ffc455286f..492e6104d2 100644 --- a/engines/mohawk/dialogs.cpp +++ b/engines/mohawk/dialogs.cpp @@ -87,7 +87,7 @@ enum { #ifdef ENABLE_MYST -MystOptionsDialog::MystOptionsDialog(MohawkEngine_Myst* vm) : GUI::OptionsDialog("", 120, 120, 360, 200), _vm(vm) { +MystOptionsDialog::MystOptionsDialog(MohawkEngine_Myst* vm) : GUI::Dialog(120, 120, 360, 200), _vm(vm) { // I18N: Option for fast scene switching _zipModeCheckbox = new GUI::CheckboxWidget(this, 15, 10, 300, 15, _("~Z~ip Mode Activated"), 0, kZipCmd); _transitionsCheckbox = new GUI::CheckboxWidget(this, 15, 30, 300, 15, _("~T~ransitions Enabled"), 0, kTransCmd); @@ -144,18 +144,22 @@ void MystOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, ui case kMapCmd: _vm->_needsShowMap = true; close(); - break; + break; case kMenuCmd: _vm->_needsShowDemoMenu = true; close(); - break; + break; case GUI::kOKCmd: _vm->_gameState->_globals.zipMode = _zipModeCheckbox->getState(); _vm->_gameState->_globals.transitions = _transitionsCheckbox->getState(); - GUI::OptionsDialog::handleCommand(sender, cmd, data); + setResult(1); + close(); + break; + case GUI::kCloseCmd: + close(); break; default: - GUI::OptionsDialog::handleCommand(sender, cmd, data); + GUI::Dialog::handleCommand(sender, cmd, data); } } diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h index 7470cd3acd..c017cb22fb 100644 --- a/engines/mohawk/dialogs.h +++ b/engines/mohawk/dialogs.h @@ -70,7 +70,7 @@ public: class MohawkEngine_Myst; -class MystOptionsDialog : public GUI::OptionsDialog { +class MystOptionsDialog : public GUI::Dialog { public: MystOptionsDialog(MohawkEngine_Myst *vm); ~MystOptionsDialog(); |