aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/state.h
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-31 16:21:11 +0000
committerMartin Kiewitz2010-01-31 16:21:11 +0000
commit72c2d360f748d5c9934db2edf3c672bac7b1e165 (patch)
tree6b9582f574bf3895f7418c083ce7b94ad1eda4b5 /engines/sci/engine/state.h
parentc991a5bcebd9c46070e41361855969bed9754e57 (diff)
downloadscummvm-rg350-72c2d360f748d5c9934db2edf3c672bac7b1e165.tar.gz
scummvm-rg350-72c2d360f748d5c9934db2edf3c672bac7b1e165.tar.bz2
scummvm-rg350-72c2d360f748d5c9934db2edf3c672bac7b1e165.zip
SCI: renamed SciPalette to GfxPalette, Screen to GfxScreen, GfxPalette is now called directly w/o SciGui
svn-id: r47752
Diffstat (limited to 'engines/sci/engine/state.h')
-rw-r--r--engines/sci/engine/state.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index ad70669f7f..58cf2f9b76 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -53,7 +53,8 @@ class SciEvent;
class Menubar;
class GfxAnimate;
class GfxPorts;
-class Screen;
+class GfxScreen;
+class GfxPalette;
class SciGui;
class Cursor;
class MessageState;
@@ -152,7 +153,8 @@ public:
GfxAnimate *_gfxAnimate; // Animate for 16-bit gfx
GfxPorts *_gfxPorts; // Port managment for 16-bit gfx
- Screen *_screen; // gfx screen
+ GfxScreen *_gfxScreen;
+ GfxPalette *_gfxPalette;
SciGui *_gui; /* Currently active Gui */
#ifdef ENABLE_SCI32