diff options
author | Colin Snover | 2016-07-28 14:49:13 -0500 |
---|---|---|
committer | Colin Snover | 2016-08-19 13:57:40 -0500 |
commit | 9bfeb3c297a7868c53d4c37775148067d72f44c0 (patch) | |
tree | 1e8b4fcc44824122de9efd4f4b5c2c6b9204bff6 /engines/sci/graphics/frameout.h | |
parent | 97be9aa6dc204843f4a896f7e12f6cabc4322b44 (diff) | |
download | scummvm-rg350-9bfeb3c297a7868c53d4c37775148067d72f44c0.tar.gz scummvm-rg350-9bfeb3c297a7868c53d4c37775148067d72f44c0.tar.bz2 scummvm-rg350-9bfeb3c297a7868c53d4c37775148067d72f44c0.zip |
SCI32: Remove GfxScreen from GfxFrameout
Only cursor remains to be updated to go through GfxFrameout, and
then we can let GfxScreen go back to being SCI16-only.
Diffstat (limited to 'engines/sci/graphics/frameout.h')
-rw-r--r-- | engines/sci/graphics/frameout.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h index 012ecf9e64..8107316371 100644 --- a/engines/sci/graphics/frameout.h +++ b/engines/sci/graphics/frameout.h @@ -31,7 +31,6 @@ typedef Common::Array<DrawList> ScreenItemListList; typedef Common::Array<RectList> EraseListList; class GfxCoordAdjuster32; -class GfxScreen; class GfxTransitions32; struct PlaneShowStyle; @@ -44,13 +43,14 @@ private: GfxCoordAdjuster32 *_coordAdjuster; GfxPalette32 *_palette; ResourceManager *_resMan; - GfxScreen *_screen; SegManager *_segMan; public: - GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxCoordAdjuster *coordAdjuster, GfxScreen *screen, GfxPalette32 *palette, GfxTransitions32 *transitions); + GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxCoordAdjuster *coordAdjuster, GfxPalette32 *palette, GfxTransitions32 *transitions); ~GfxFrameout(); + bool _isHiRes; + void clear(); void syncWithScripts(bool addElements); // this is what Game::restore does, only needed when our ScummVM dialogs are patched in void run(); @@ -308,8 +308,6 @@ private: } public: - bool _isHiRes; - /** * Whether palMorphFrameOut should be used instead of * frameOut for rendering. Used by kMorphOn to |