diff options
author | Martin Kiewitz | 2009-10-06 16:14:40 +0000 |
---|---|---|
committer | Martin Kiewitz | 2009-10-06 16:14:40 +0000 |
commit | 14dfa5d7b01fba21c3da100830febbcdd1532d8c (patch) | |
tree | aaea4035a41e5b979178fa3220aaf5d780a365e9 /engines/sci/gui/gui.h | |
parent | 855af31757d20ace18f8b96c09d44571aacc049b (diff) | |
download | scummvm-rg350-14dfa5d7b01fba21c3da100830febbcdd1532d8c.tar.gz scummvm-rg350-14dfa5d7b01fba21c3da100830febbcdd1532d8c.tar.bz2 scummvm-rg350-14dfa5d7b01fba21c3da100830febbcdd1532d8c.zip |
SCI/newgui: palette functions from SciGuiGfx now in SciGuiPalette
svn-id: r44698
Diffstat (limited to 'engines/sci/gui/gui.h')
-rw-r--r-- | engines/sci/gui/gui.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h index a12449e5ca..79185deddf 100644 --- a/engines/sci/gui/gui.h +++ b/engines/sci/gui/gui.h @@ -31,6 +31,7 @@ namespace Sci { class SciGuiScreen; +class SciGuiPalette; class SciGuiGfx; class SciGuiresources; class SciGuiWindowMgr; @@ -43,7 +44,7 @@ public: // FIXME: Don't store EngineState virtual void resetEngineState(EngineState *s) { _s = s; } - virtual void init(bool oldGfxFunctions); + virtual void init(bool usesOldGfxFunctions); virtual int16 getTimeTicks(); virtual void wait(int16 ticks); @@ -89,14 +90,20 @@ public: virtual void moveCursor(int16 x, int16 y, int16 scaleFactor = 1); void moveCursor(Common::Point p, int16 scaleFactor = 1) { moveCursor(p.x, p.y, scaleFactor); } + int _picNotValid; // possible values 0, 1 and 2 + private: + static void timerHandler(void*ref); + OSystem *_system; EngineState *_s; SciGuiScreen *_screen; + SciGuiPalette *_palette; SciGuiGfx *_gfx; SciGuiresources *_resources; SciGuiWindowMgr *_windowMgr; - bool _usesOldGfxFunctions; + uint32 _sysTicks; + int32 _sysSpeed; // ticker timer in ms }; } // End of namespace Sci |