aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/state.h
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-31 22:20:55 +0000
committerMartin Kiewitz2010-01-31 22:20:55 +0000
commitd31f696d1f5c9f5fb79be0524a6142e967308220 (patch)
tree6a805b593551bb089dd8846b15eca183b1ea01e4 /engines/sci/engine/state.h
parent12d983eaf41bd8353849ee8776fc2bbc59808870 (diff)
downloadscummvm-rg350-d31f696d1f5c9f5fb79be0524a6142e967308220.tar.gz
scummvm-rg350-d31f696d1f5c9f5fb79be0524a6142e967308220.tar.bz2
scummvm-rg350-d31f696d1f5c9f5fb79be0524a6142e967308220.zip
SCI: rename Controls to GfxControls, gets directly called now
svn-id: r47783
Diffstat (limited to 'engines/sci/engine/state.h')
-rw-r--r--engines/sci/engine/state.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 9d7a7a5ab4..1acee49dba 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -52,10 +52,11 @@ namespace Sci {
class SciEvent;
class Menubar;
class GfxAnimate;
+class GfxCache;
+class GfxControls;
+class GfxPalette;
class GfxPorts;
class GfxScreen;
-class GfxPalette;
-class GfxCache;
class SciGui;
class Cursor;
class MessageState;
@@ -157,10 +158,11 @@ public:
/* Non-VM information */
GfxAnimate *_gfxAnimate; // Animate for 16-bit gfx
+ GfxCache *_gfxCache;
+ GfxControls *_gfxControls; // Controls for 16-bit gfx
+ GfxPalette *_gfxPalette;
GfxPorts *_gfxPorts; // Port managment for 16-bit gfx
GfxScreen *_gfxScreen;
- GfxPalette *_gfxPalette;
- GfxCache *_gfxCache;
SciGui *_gui; /* Currently active Gui */
#ifdef ENABLE_SCI32