diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 981f17778c0..e0a70d80fe2 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -204,6 +204,51 @@ static const ResString string_map_table_v345[] = { #pragma mark - +#ifndef DISABLE_HELP + +class HelpDialog : public ScummDialog { +public: + HelpDialog(const GameSettings &game); + virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data); + + virtual void reflowLayout(); + +protected: + typedef Common::String String; + + GUI::ButtonWidget *_nextButton; + GUI::ButtonWidget *_prevButton; + + GUI::StaticTextWidget *_title; + GUI::StaticTextWidget *_key[HELP_NUM_LINES]; + GUI::StaticTextWidget *_dsc[HELP_NUM_LINES]; + + int _page; + int _numPages; + int _numLines; + + const GameSettings _game; + + void displayKeyBindings(); +}; + +#endif + +class ConfigDialog : public GUI::OptionsDialog { +protected: +#ifdef SMALL_SCREEN_DEVICE + GUI::Dialog *_keysDialog; +#endif + +public: + ConfigDialog(); + ~ConfigDialog(); + + virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data); +}; + +#pragma mark - + ScummDialog::ScummDialog(int x, int y, int w, int h) : GUI::Dialog(x, y, w, h) { _backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial; } diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h index bda0adf9ea0..7889027dcf1 100644 --- a/engines/scumm/dialogs.h +++ b/engines/scumm/dialogs.h @@ -32,9 +32,6 @@ #include "gui/saveload.h" #include "scumm/detection.h" -#ifndef DISABLE_HELP -#include "scumm/help.h" -#endif namespace GUI { class ListWidget; @@ -82,49 +79,6 @@ protected: void load(); }; -#ifndef DISABLE_HELP - -class HelpDialog : public ScummDialog { -public: - HelpDialog(const GameSettings &game); - virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data); - - virtual void reflowLayout(); - -protected: - typedef Common::String String; - - GUI::ButtonWidget *_nextButton; - GUI::ButtonWidget *_prevButton; - - GUI::StaticTextWidget *_title; - GUI::StaticTextWidget *_key[HELP_NUM_LINES]; - GUI::StaticTextWidget *_dsc[HELP_NUM_LINES]; - - int _page; - int _numPages; - int _numLines; - - const GameSettings _game; - - void displayKeyBindings(); -}; - -#endif - -class ConfigDialog : public GUI::OptionsDialog { -protected: -#ifdef SMALL_SCREEN_DEVICE - GUI::Dialog *_keysDialog; -#endif - -public: - ConfigDialog(); - ~ConfigDialog(); - - virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data); -}; - /** * A dialog which displays an arbitrary message to the user and returns * ther users reply as its result value. More specifically, it returns