diff options
author | Paul Gilbert | 2016-09-21 07:26:24 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-09-21 07:26:24 -0400 |
commit | 2e4fc11320b90db0485a937ec14b3464f3195e0a (patch) | |
tree | 9590126c8a443ff25864cc4403632c36139c7b69 /engines/xeen/dialogs.h | |
parent | 41fea11ce68d21f900f39e65c35f766f2d7a5509 (diff) | |
download | scummvm-rg350-2e4fc11320b90db0485a937ec14b3464f3195e0a.tar.gz scummvm-rg350-2e4fc11320b90db0485a937ec14b3464f3195e0a.tar.bz2 scummvm-rg350-2e4fc11320b90db0485a937ec14b3464f3195e0a.zip |
XEEN: Refactored doScroll to have it available to cutscenes
Diffstat (limited to 'engines/xeen/dialogs.h')
-rw-r--r-- | engines/xeen/dialogs.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/engines/xeen/dialogs.h b/engines/xeen/dialogs.h index 51eafa5f54..93e9a86685 100644 --- a/engines/xeen/dialogs.h +++ b/engines/xeen/dialogs.h @@ -26,6 +26,7 @@ #include "common/array.h" #include "common/stack.h" #include "common/rect.h" +#include "xeen/cutscenes.h" #include "xeen/sprites.h" #include "xeen/xsurface.h" @@ -46,21 +47,21 @@ public: UIButton() : _value(0), _sprites(nullptr), _draw(false) {} }; -class ButtonContainer { +class ButtonContainer : public Cutscenes { private: Common::Stack< Common::Array<UIButton> > _savedButtons; protected: Common::Array<UIButton> _buttons; int _buttonValue; + bool checkEvents(XeenEngine *vm); + /** * Draws the scroll in the background */ - void doScroll(XeenEngine *vm, bool drawFlag, bool doFade); - - bool checkEvents(XeenEngine *vm); + virtual void doScroll(bool drawFlag, bool doFade); public: - ButtonContainer() : _buttonValue(0) {} + ButtonContainer(XeenEngine *vm) : Cutscenes(vm), _buttonValue(0) {} /** * Saves the current list of buttons @@ -85,20 +86,16 @@ public: class SettingsBaseDialog : public ButtonContainer { protected: - XeenEngine *_vm; - virtual void showContents(SpriteResource &title1, bool mode); public: - SettingsBaseDialog(XeenEngine *vm) : ButtonContainer(), _vm(vm) {} + SettingsBaseDialog(XeenEngine *vm) : ButtonContainer(vm) {} virtual ~SettingsBaseDialog() {} }; class CreditsScreen: public ButtonContainer { private: - XeenEngine *_vm; - - CreditsScreen(XeenEngine *vm) : ButtonContainer(), _vm(vm) {} + CreditsScreen(XeenEngine *vm) : ButtonContainer(vm) {} void execute(); public: |