diff options
Diffstat (limited to 'engines/sci/graphics/palette.h')
| -rw-r--r-- | engines/sci/graphics/palette.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h index 82fd20a432..dfc276fa59 100644 --- a/engines/sci/graphics/palette.h +++ b/engines/sci/graphics/palette.h @@ -53,11 +53,11 @@ public: bool isUsing16bitColorMatch(); void setDefault(); - void createFromData(byte *data, int bytesLeft, Palette *paletteOut); + void createFromData(byte *data, int bytesLeft, Palette *paletteOut) const; bool setAmiga(); void modifyAmigaPalette(byte *data); void setEGA(); - void set(Palette *sciPal, bool force, bool forceRealMerge = false); + virtual void set(Palette *sciPal, bool force, bool forceRealMerge = false); bool insert(Palette *newPalette, Palette *destPalette); bool merge(Palette *pFrom, bool force, bool forceRealMerge); uint16 matchColor(byte r, byte g, byte b); @@ -78,7 +78,7 @@ public: void drewPicture(GuiResourceId pictureId); - bool kernelSetFromResource(GuiResourceId resourceId, bool force); + virtual bool kernelSetFromResource(GuiResourceId resourceId, bool force); void kernelSetFlag(uint16 fromColor, uint16 toColor, uint16 flag); void kernelUnsetFlag(uint16 fromColor, uint16 toColor, uint16 flag); void kernelSetIntensity(uint16 fromColor, uint16 toColor, uint16 intensity, bool setPalette); @@ -96,7 +96,7 @@ public: int16 kernelPalVaryGetCurrentStep(); int16 kernelPalVaryChangeTarget(GuiResourceId resourceId); void kernelPalVaryChangeTicks(uint16 ticks); - void kernelPalVaryPause(bool pause); + virtual void kernelPalVaryPause(bool pause); void kernelPalVaryDeinit(); void palVaryUpdate(); void palVaryPrepareForTransition(); @@ -110,7 +110,7 @@ public: byte findMacIconBarColor(byte r, byte g, byte b); bool colorIsFromMacClut(byte index); -private: +protected: void palVaryInit(); void palVaryInstallTimer(); void palVaryRemoveTimer(); |