aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.h
diff options
context:
space:
mode:
authorColin Snover2016-01-06 20:00:28 -0600
committerColin Snover2016-01-07 16:35:09 -0600
commitaeee621e4413fe71ffada6c4bc096ae2a5a8c204 (patch)
tree41817ee3e96fcc279988bb5e604553694e2737ba /engines/sci/sci.h
parent453afd7bbc7b83506638bf87b830384078f729e1 (diff)
downloadscummvm-rg350-aeee621e4413fe71ffada6c4bc096ae2a5a8c204.tar.gz
scummvm-rg350-aeee621e4413fe71ffada6c4bc096ae2a5a8c204.tar.bz2
scummvm-rg350-aeee621e4413fe71ffada6c4bc096ae2a5a8c204.zip
SCI32: Add initial support for palette cycling (kPalCycle) and fading (kPalFade)
Graphics palette code was rewritten between SCI1 and SCI2, so SCI32 palette engine code has been moved to a separate GfxPalette32 class.
Diffstat (limited to 'engines/sci/sci.h')
-rw-r--r--engines/sci/sci.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 15034d5e94..c5528e412a 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -79,6 +79,7 @@ class GfxTransitions;
#ifdef ENABLE_SCI32
class RobotDecoder;
class GfxFrameout;
+class GfxPalette32;
#endif
// our engine debug levels
@@ -235,6 +236,7 @@ public:
bool canLoadGameStateCurrently();
bool canSaveGameStateCurrently();
void syncSoundSettings();
+ uint32 getTickCount();
/**
* Syncs the audio options of the ScummVM launcher (speech, subtitles or
@@ -343,7 +345,8 @@ public:
GfxCoordAdjuster *_gfxCoordAdjuster;
GfxCursor *_gfxCursor;
GfxMenu *_gfxMenu; // Menu for 16-bit gfx
- GfxPalette *_gfxPalette;
+ GfxPalette *_gfxPalette16;
+ GfxPalette32 *_gfxPalette32; // Palette for 32-bit gfx
GfxPaint *_gfxPaint;
GfxPaint16 *_gfxPaint16; // Painting in 16-bit gfx
GfxPaint32 *_gfxPaint32; // Painting in 32-bit gfx