thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MOHAWK: Remove Unused Engine Pointer from Riven Options Dialog

Browse source 
Flagged by GCC -Wunused-private-field
This commit is contained in:
D G Turner 2019-12-14 21:31:44 +00:00
parent 0edf2da7ba
commit dbd7581c41
3 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/mohawk/dialogs.cpp
View file

@ -289,9 +289,7 @@ void MystOptionsDialog::setTransitions(bool enabled) {
#ifdef ENABLE_RIVEN #ifdef ENABLE_RIVEN
RivenOptionsDialog::RivenOptionsDialog(MohawkEngine_Riven* vm) : RivenOptionsDialog::RivenOptionsDialog() : MohawkOptionsDialog() {
MohawkOptionsDialog(),
_vm(vm) {
_zipModeCheckbox = new GUI::CheckboxWidget(this, 15, 10, 220, 15, _("~Z~ip Mode Activated"), nullptr, kZipCmd); _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); _waterEffectCheckbox = new GUI::CheckboxWidget(this, 15, 35, 220, 15, _("~W~ater Effect Enabled"), nullptr, kWaterCmd);

6
engines/mohawk/dialogs.h
View file

@ -151,11 +151,9 @@ private:
#ifdef ENABLE_RIVEN #ifdef ENABLE_RIVEN
class MohawkEngine_Riven;
class RivenOptionsDialog : public MohawkOptionsDialog { class RivenOptionsDialog : public MohawkOptionsDialog {
public: public:
explicit RivenOptionsDialog(MohawkEngine_Riven *vm); explicit RivenOptionsDialog();
~RivenOptionsDialog() override; ~RivenOptionsDialog() override;
void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override; void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
@ -167,8 +165,6 @@ public:
uint32 getTransitions() const; uint32 getTransitions() const;
void setTransitions(uint32 mode); void setTransitions(uint32 mode);
private: private:
MohawkEngine_Riven *_vm;
GUI::CheckboxWidget *_zipModeCheckbox; GUI::CheckboxWidget *_zipModeCheckbox;
GUI::CheckboxWidget *_waterEffectCheckbox; GUI::CheckboxWidget *_waterEffectCheckbox;
GUI::StaticTextWidget *_transitionModeCaption; GUI::StaticTextWidget *_transitionModeCaption;

2
engines/mohawk/riven.cpp
View file

@ -136,7 +136,7 @@ Common::Error MohawkEngine_Riven::run() {
_sound = new RivenSoundManager(this); _sound = new RivenSoundManager(this);
_console = new RivenConsole(this); _console = new RivenConsole(this);
_saveLoad = new RivenSaveLoad(this, _saveFileMan); _saveLoad = new RivenSaveLoad(this, _saveFileMan);
_optionsDialog = new RivenOptionsDialog(this); _optionsDialog = new RivenOptionsDialog();
_scriptMan = new RivenScriptManager(this); _scriptMan = new RivenScriptManager(this);
_inventory = new RivenInventory(this); _inventory = new RivenInventory(this);