diff options
Diffstat (limited to 'engines/scumm/scumm.h')
| -rw-r--r-- | engines/scumm/scumm.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index f0f2521225..940ea512d5 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -667,9 +667,6 @@ public: } static Graphics::Surface *loadThumbnailFromSlot(const char *target, int slot); - bool loadInfosFromSlot(int slot, InfoStuff *stuff) { - return loadInfosFromSlot(_targetName.c_str(), slot, stuff); - } static bool loadInfosFromSlot(const char *target, int slot, InfoStuff *stuff); protected: @@ -966,6 +963,7 @@ public: int _screenTop; Common::RenderMode _renderMode; + uint8 _bitDepth; protected: ColorCycle _colorCycle[16]; // Palette cycles @@ -985,7 +983,10 @@ protected: byte animate, animateIndex; int8 state; } _cursor; - byte _grabbedCursor[8192]; + + // HACK Double the array size to handle 16-bit images. + // this should be dynamically allocated based on game depth instead. + byte _grabbedCursor[16384]; byte _currentCursor; byte _newEffect, _switchRoomEffect2, _switchRoomEffect; @@ -1044,7 +1045,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); @@ -1120,7 +1122,7 @@ public: // HE specific byte _HEV7ActorPalette[256]; uint8 *_hePalettes; - int16 *_hePaletteCache; + uint16 _hePaletteSlot; protected: int _shadowPaletteSize; |