diff options
| -rw-r--r-- | engines/mohawk/dialogs.cpp | 9 | ||||
| -rw-r--r-- | engines/mohawk/dialogs.h | 7 | 
2 files changed, 14 insertions, 2 deletions
| diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp index 3fe64350b4..c5a0c7e86d 100644 --- a/engines/mohawk/dialogs.cpp +++ b/engines/mohawk/dialogs.cpp @@ -24,7 +24,6 @@   */  #include "mohawk/mohawk.h" -#include "mohawk/riven.h"  #include "mohawk/dialogs.h"  #include "gui/gui-manager.h" @@ -35,6 +34,10 @@  #include "mohawk/myst.h"  #endif +#ifdef ENABLE_RIVEN +#include "mohawk/riven.h" +#endif +  namespace Mohawk {  // This used to have GUI::Dialog("MohawkDummyDialog"), but that doesn't work with the gui branch merge :P (Sorry, Tanoku!) @@ -118,6 +121,8 @@ void MystOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, ui  #endif +#ifdef ENABLE_RIVEN +  RivenOptionsDialog::RivenOptionsDialog(MohawkEngine_Riven* vm) : GUI::OptionsDialog("", 120, 120, 360, 200), _vm(vm) {  	_zipModeCheckbox = new GUI::CheckboxWidget(this, 15, 10, 300, 15, _("~Z~ip Mode Activated"), 0, kZipCmd);  	_waterEffectCheckbox = new GUI::CheckboxWidget(this, 15, 30, 300, 15, _("~W~ater Effect Enabled"), 0, kWaterCmd); @@ -152,4 +157,6 @@ void RivenOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, u  	}  } +#endif +  } // End of namespace Mohawk diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h index 3a1d194a1d..106a1566fc 100644 --- a/engines/mohawk/dialogs.h +++ b/engines/mohawk/dialogs.h @@ -38,7 +38,6 @@  namespace Mohawk {  class MohawkEngine; -class MohawkEngine_Riven;  class InfoDialog : public GUI::Dialog {  protected: @@ -89,6 +88,10 @@ private:  #endif +#ifdef ENABLE_RIVEN + +class MohawkEngine_Riven; +  class RivenOptionsDialog : public GUI::OptionsDialog {  public:  	RivenOptionsDialog(MohawkEngine_Riven *vm); @@ -102,6 +105,8 @@ private:  	GUI::CheckboxWidget *_waterEffectCheckbox;  }; +#endif +  } // End of namespace Mohawk  #endif | 
