diff options
| author | Walter van Niftrik | 2016-02-27 13:54:47 +0100 |
|---|---|---|
| committer | Walter van Niftrik | 2016-03-09 10:03:13 +0100 |
| commit | 183fe8b217c09df4deef3e31d5c01531bb532c50 (patch) | |
| tree | 0f24a6ab0f24675296f5d8e8fc3115ae13a470b9 /engines/adl/adl.h | |
| parent | 9717aa956197480a608622a2e294fa8302258a0e (diff) | |
| download | scummvm-rg350-183fe8b217c09df4deef3e31d5c01531bb532c50.tar.gz scummvm-rg350-183fe8b217c09df4deef3e31d5c01531bb532c50.tar.bz2 scummvm-rg350-183fe8b217c09df4deef3e31d5c01531bb532c50.zip | |
ADL: Move members into base class
Diffstat (limited to 'engines/adl/adl.h')
| -rw-r--r-- | engines/adl/adl.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/engines/adl/adl.h b/engines/adl/adl.h index 954c61335d..55ba0fcdec 100644 --- a/engines/adl/adl.h +++ b/engines/adl/adl.h @@ -24,7 +24,10 @@ #define ADL_ADL_H #include "common/random.h" +#include "common/rect.h" + #include "engines/engine.h" + #include "gui/debugger.h" namespace Common { @@ -102,14 +105,24 @@ protected: virtual void runGame() = 0; Common::String readString(Common::ReadStream &stream, byte until = 0); void printStrings(Common::SeekableReadStream &stream, int count = 1); + Display *_display; Parser *_parser; -private: - Console *_console; - - // We need random numbers - Common::RandomSource *_rnd; + Common::Array<Common::String> _msgStrings; + Common::Array<Picture> _pictures; + Common::Array<Item> _inventory; + Common::Array<Common::Point> _itemOffsets; + Common::Array<Common::Array<byte> > _drawings; + Commands _roomCommands; + Commands _globalCommands; + + // Game state + Common::Array<Room> _rooms; + byte _room; + uint16 _steps; + Common::Array<byte> _variables; + bool _isDark; }; // Example console class |