From dbd7581c414a63cb758ebfe93ceff0b4d72dede8 Mon Sep 17 00:00:00 2001
From: D G Turner <digitall@scummvm.org>
Date: Sat, 14 Dec 2019 21:31:44 +0000
Subject: [PATCH] MOHAWK: Remove Unused Engine Pointer from Riven Options
 Dialog

Flagged by GCC -Wunused-private-field
---
 engines/mohawk/dialogs.cpp | 4 +---
 engines/mohawk/dialogs.h   | 6 +-----
 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 667cb34f5ef..e12e7d5f73e 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 514e5e0524f..b7fcdab98c5 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 01977e994b4..68c463a94b8 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);