diff options
| author | D G Turner | 2018-07-29 06:00:42 +0100 |
|---|---|---|
| committer | D G Turner | 2018-07-29 06:00:42 +0100 |
| commit | 1f3aaac12cddddd4c89e70759506506b35c2d8bc (patch) | |
| tree | b0b115db7555407d01b93199c911727855bfebf6 | |
| parent | 8f1e1bdd8cf11c3e26ca2471457f2444b9afefb5 (diff) | |
| download | scummvm-rg350-1f3aaac12cddddd4c89e70759506506b35c2d8bc.tar.gz scummvm-rg350-1f3aaac12cddddd4c89e70759506506b35c2d8bc.tar.bz2 scummvm-rg350-1f3aaac12cddddd4c89e70759506506b35c2d8bc.zip | |
MOHAWK: Silent Compiler Warning About Unused VM Pointer.
This can be restored if required at a later time.
| -rw-r--r-- | engines/mohawk/dialogs.cpp | 9 | ||||
| -rw-r--r-- | engines/mohawk/dialogs.h | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp index 31997f4daf..9be05a178d 100644 --- a/engines/mohawk/dialogs.cpp +++ b/engines/mohawk/dialogs.cpp @@ -93,9 +93,8 @@ enum { #if defined(ENABLE_MYST) || defined(ENABLE_RIVEN) -MohawkOptionsDialog::MohawkOptionsDialog(MohawkEngine *vm) : - GUI::Dialog(0, 0, 360, 200), - _vm(vm) { +MohawkOptionsDialog::MohawkOptionsDialog() : + GUI::Dialog(0, 0, 360, 200) { new GUI::ButtonWidget(this, 95, 160, 120, 25, _("~O~K"), nullptr, GUI::kOKCmd); new GUI::ButtonWidget(this, 225, 160, 120, 25, _("~C~ancel"), nullptr, GUI::kCloseCmd); } @@ -130,7 +129,7 @@ void MohawkOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, #ifdef ENABLE_MYST MystOptionsDialog::MystOptionsDialog(MohawkEngine_Myst* vm) : - MohawkOptionsDialog(vm), + MohawkOptionsDialog(), _vm(vm), _canDropPage(false), _canShowMap(false), @@ -281,7 +280,7 @@ void MystOptionsDialog::setCanReturnToMenu(bool canReturnToMenu) { #ifdef ENABLE_RIVEN RivenOptionsDialog::RivenOptionsDialog(MohawkEngine_Riven* vm) : - MohawkOptionsDialog(vm), + MohawkOptionsDialog(), _vm(vm) { _zipModeCheckbox = new GUI::CheckboxWidget(this, 15, 10, 220, 15, _("~Z~ip Mode Activated"), nullptr, kZipCmd); _waterEffectCheckbox = new GUI::CheckboxWidget(this, 15, 35, 220, 15, _("~W~ater Effect Enabled"), nullptr, kWaterCmd); diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h index 71cf7a2bac..03b964369d 100644 --- a/engines/mohawk/dialogs.h +++ b/engines/mohawk/dialogs.h @@ -76,14 +76,11 @@ public: class MohawkOptionsDialog : public GUI::Dialog { public: - explicit MohawkOptionsDialog(MohawkEngine *_vm); + explicit MohawkOptionsDialog(); ~MohawkOptionsDialog() override; void reflowLayout() override; void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override; - -private: - MohawkEngine *_vm; }; #endif |