diff options
| author | Einar Johan Trøan Sømåen | 2013-02-06 12:45:46 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-02-06 13:40:35 +0100 |
| commit | 74e32bd3329b8d7b19d97ddff140fb23b901c2d6 (patch) | |
| tree | 0094aec3cdb326d528f81971d76cbf042ff8b908 /engines/wintermute/base | |
| parent | 83152fd6088f08c238a1d175cfadef847dd7eaac (diff) | |
| download | scummvm-rg350-74e32bd3329b8d7b19d97ddff140fb23b901c2d6.tar.gz scummvm-rg350-74e32bd3329b8d7b19d97ddff140fb23b901c2d6.tar.bz2 scummvm-rg350-74e32bd3329b8d7b19d97ddff140fb23b901c2d6.zip | |
WINTERMUTE: Privatize a few more members in BaseGame.
Diffstat (limited to 'engines/wintermute/base')
| -rw-r--r-- | engines/wintermute/base/base_game.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index a902727f5f..5666fb818c 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -119,14 +119,15 @@ public: int _offsetX; float _offsetPercentX; float _offsetPercentY; - BaseObject *_mainObject; + + inline BaseObject *getMainObject() { return _mainObject; } + inline BaseFont *getSystemFont() { return _systemFont; } bool initInput(); bool initLoop(); uint32 _currentTime; uint32 _deltaTime; - BaseFont *_systemFont; - BaseFont *_videoFont; + bool initialize1(); bool initialize2(); bool initialize3(); @@ -249,6 +250,9 @@ public: bool _touchInterface; bool _constrainedMemory; protected: + BaseFont *_systemFont; + BaseFont *_videoFont; + BaseSprite *_loadingIcon; int _loadingIconX; int _loadingIconY; @@ -260,6 +264,8 @@ protected: VideoPlayer *_videoPlayer; VideoTheoraPlayer *_theoraPlayer; private: + BaseObject *_mainObject; + bool _mouseRightDown; bool _mouseMidlleDown; bool _settingsRequireAcceleration; |