diff options
Diffstat (limited to 'engines/sci/graphics/palette.h')
| -rw-r--r-- | engines/sci/graphics/palette.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h index 6d1a3a9845..5fd9e13d36 100644 --- a/engines/sci/graphics/palette.h +++ b/engines/sci/graphics/palette.h @@ -41,8 +41,8 @@ public: void modifyAmigaPalette(byte *data); void setEGA(); bool setFromResource(GuiResourceId resourceId, uint16 flag); - void set(Palette *sciPal, uint16 flag); - void merge(Palette *pFrom, Palette *pTo, uint16 flag); + void set(Palette *sciPal, uint16 flag, bool forceRealMerge = false); + void merge(Palette *pFrom, Palette *pTo, uint16 flag, bool forceRealMerge); uint16 matchColor(Palette *pPal, byte r, byte g, byte b); void getSys(Palette *pal); |