diff options
| author | D G Turner | 2019-12-14 21:31:44 +0000 |
|---|---|---|
| committer | D G Turner | 2019-12-14 21:31:44 +0000 |
| commit | dbd7581c414a63cb758ebfe93ceff0b4d72dede8 (patch) | |
| tree | 95ce97c6d51a7188c98d93c0179fb15e81d28d08 /engines | |
| parent | 0edf2da7ba3257d31053a6a18927fc37b7441260 (diff) | |
| download | scummvm-rg350-dbd7581c414a63cb758ebfe93ceff0b4d72dede8.tar.gz scummvm-rg350-dbd7581c414a63cb758ebfe93ceff0b4d72dede8.tar.bz2 scummvm-rg350-dbd7581c414a63cb758ebfe93ceff0b4d72dede8.zip | |
MOHAWK: Remove Unused Engine Pointer from Riven Options Dialog
Flagged by GCC -Wunused-private-field
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mohawk/dialogs.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/dialogs.h | 6 | ||||
| -rw-r--r-- | engines/mohawk/riven.cpp | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp index 667cb34f5e..e12e7d5f73 100644 --- a/engines/mohawk/dialogs.cpp +++ b/engines/mohawk/dialogs.cpp @@ -289,9 +289,7 @@ void MystOptionsDialog::setTransitions(bool enabled) { #ifdef ENABLE_RIVEN -RivenOptionsDialog::RivenOptionsDialog(MohawkEngine_Riven* vm) : - MohawkOptionsDialog(), - _vm(vm) { +RivenOptionsDialog::RivenOptionsDialog() : MohawkOptionsDialog() { _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 514e5e0524..b7fcdab98c 100644 --- a/engines/mohawk/dialogs.h +++ b/engines/mohawk/dialogs.h @@ -151,11 +151,9 @@ private: #ifdef ENABLE_RIVEN -class MohawkEngine_Riven; - class RivenOptionsDialog : public MohawkOptionsDialog { public: - explicit RivenOptionsDialog(MohawkEngine_Riven *vm); + explicit RivenOptionsDialog(); ~RivenOptionsDialog() override; void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override; @@ -167,8 +165,6 @@ public: uint32 getTransitions() const; void setTransitions(uint32 mode); private: - MohawkEngine_Riven *_vm; - GUI::CheckboxWidget *_zipModeCheckbox; GUI::CheckboxWidget *_waterEffectCheckbox; GUI::StaticTextWidget *_transitionModeCaption; diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 01977e994b..68c463a94b 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -136,7 +136,7 @@ Common::Error MohawkEngine_Riven::run() { _sound = new RivenSoundManager(this); _console = new RivenConsole(this); _saveLoad = new RivenSaveLoad(this, _saveFileMan); - _optionsDialog = new RivenOptionsDialog(this); + _optionsDialog = new RivenOptionsDialog(); _scriptMan = new RivenScriptManager(this); _inventory = new RivenInventory(this); |