From 4b900cc432cf1640d65a6f3b588d9582140ae824 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Mon, 18 Jun 2018 21:42:34 +0200 Subject: MOHAWK: RIVEN: Remove the load/save/quit buttons from the options dialog Those features can now be accessed through the main menu --- engines/mohawk/dialogs.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'engines/mohawk/dialogs.h') diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h index 567a0fc214..71cf7a2bac 100644 --- a/engines/mohawk/dialogs.h +++ b/engines/mohawk/dialogs.h @@ -79,30 +79,11 @@ public: explicit MohawkOptionsDialog(MohawkEngine *_vm); ~MohawkOptionsDialog() override; - void open() override; void reflowLayout() override; void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override; - int getLoadSlot() const { return _loadSlot; } - int getSaveSlot() const { return _saveSlot; } - Common::String getSaveDescription() const { return _saveDescription; } - -protected: +private: MohawkEngine *_vm; - - GUI::ButtonWidget *_loadButton; - GUI::ButtonWidget *_saveButton; - GUI::ButtonWidget *_quitButton; - - GUI::SaveLoadChooser *_loadDialog; - GUI::SaveLoadChooser *_saveDialog; - - int _loadSlot; - int _saveSlot; - Common::String _saveDescription; - - void save(); - void load(); }; #endif @@ -131,9 +112,27 @@ public: void open() override; void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override; + int getLoadSlot() const { return _loadSlot; } + int getSaveSlot() const { return _saveSlot; } + Common::String getSaveDescription() const { return _saveDescription; } + private: + void save(); + void load(); + MohawkEngine_Myst *_vm; + GUI::ButtonWidget *_loadButton; + GUI::ButtonWidget *_saveButton; + GUI::ButtonWidget *_quitButton; + + GUI::SaveLoadChooser *_loadDialog; + GUI::SaveLoadChooser *_saveDialog; + + int _loadSlot; + int _saveSlot; + Common::String _saveDescription; + bool _canDropPage; bool _canShowMap; bool _canReturnToMenu; -- cgit v1.2.3