diff options
author | Travis Howell | 2009-06-04 01:05:47 +0000 |
---|---|---|
committer | Travis Howell | 2009-06-04 01:05:47 +0000 |
commit | 3a64d35dfd9126d7912c4d4496030f7ed120d660 (patch) | |
tree | d31b135a189e23fbebe806d77b9c5675ba2ed244 /engines/scumm/scumm.h | |
parent | 8447a3650e7de2fc780c1c354f70bf0d119622b3 (diff) | |
download | scummvm-rg350-3a64d35dfd9126d7912c4d4496030f7ed120d660.tar.gz scummvm-rg350-3a64d35dfd9126d7912c4d4496030f7ed120d660.tar.bz2 scummvm-rg350-3a64d35dfd9126d7912c4d4496030f7ed120d660.zip |
Add 16bit color support for later HE games.
svn-id: r41153
Diffstat (limited to 'engines/scumm/scumm.h')
-rw-r--r-- | engines/scumm/scumm.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index ff3852ee83..c4b2ab9e56 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -954,6 +954,7 @@ public: int _screenTop; Common::RenderMode _renderMode; + uint8 _bitDepth; protected: ColorCycle _colorCycle[16]; // Palette cycles @@ -1039,7 +1040,8 @@ protected: virtual void palManipulateInit(int resID, int start, int end, int time); void palManipulate(); public: - int convert16BitColor(uint16 color, uint8 r, uint8 g, uint8 b); + uint8 *getHEPaletteSlot(uint16 palSlot); + uint16 get16BitColor(uint8 r, uint8 g, uint8 b); int remapPaletteColor(int r, int g, int b, int threshold); // Used by Actor::remapActorPalette protected: void moveMemInPalRes(int start, int end, byte direction); @@ -1115,7 +1117,7 @@ public: // HE specific byte _HEV7ActorPalette[256]; uint8 *_hePalettes; - int16 *_hePaletteCache; + uint16 _hePaletteSlot; protected: int _shadowPaletteSize; |