libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 17:03:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MOHAWK: Silent Compiler Warning About Unused VM Pointer.

Browse Source 
This can be restored if required at a later time.
This commit is contained in:
D G Turner 2018-07-29 06:00:42 +01:00
parent 8f1e1bdd8c
commit 1f3aaac12c
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/mohawk/dialogs.cpp
View File

@ -93,9 +93,8 @@ enum {
#if defined(ENABLE_MYST) || defined(ENABLE_RIVEN) #if defined(ENABLE_MYST) || defined(ENABLE_RIVEN)
MohawkOptionsDialog::MohawkOptionsDialog(MohawkEngine *vm) : MohawkOptionsDialog::MohawkOptionsDialog() :
GUI::Dialog(0, 0, 360, 200), GUI::Dialog(0, 0, 360, 200) {
_vm(vm) {
new GUI::ButtonWidget(this, 95, 160, 120, 25, _("~O~K"), nullptr, GUI::kOKCmd); 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); 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 #ifdef ENABLE_MYST
MystOptionsDialog::MystOptionsDialog(MohawkEngine_Myst* vm) : MystOptionsDialog::MystOptionsDialog(MohawkEngine_Myst* vm) :
MohawkOptionsDialog(vm), MohawkOptionsDialog(),
_vm(vm), _vm(vm),
_canDropPage(false), _canDropPage(false),
_canShowMap(false), _canShowMap(false),
@ -281,7 +280,7 @@ void MystOptionsDialog::setCanReturnToMenu(bool canReturnToMenu) {
#ifdef ENABLE_RIVEN #ifdef ENABLE_RIVEN
RivenOptionsDialog::RivenOptionsDialog(MohawkEngine_Riven* vm) : RivenOptionsDialog::RivenOptionsDialog(MohawkEngine_Riven* vm) :
MohawkOptionsDialog(vm), MohawkOptionsDialog(),
_vm(vm) { _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);

5
engines/mohawk/dialogs.h
View File

@ -76,14 +76,11 @@ public:
class MohawkOptionsDialog : public GUI::Dialog { class MohawkOptionsDialog : public GUI::Dialog {
public: public:
explicit MohawkOptionsDialog(MohawkEngine *_vm); explicit MohawkOptionsDialog();
~MohawkOptionsDialog() override; ~MohawkOptionsDialog() override;
void reflowLayout() override; void reflowLayout() override;
void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override; void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
private:
MohawkEngine *_vm;
}; };
#endif #endif