aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/palette.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/graphics/palette.h')
-rw-r--r--engines/sci/graphics/palette.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h
index 5fd9e13d36..b2d007c6b3 100644
--- a/engines/sci/graphics/palette.h
+++ b/engines/sci/graphics/palette.h
@@ -40,9 +40,9 @@ public:
bool setAmiga();
void modifyAmigaPalette(byte *data);
void setEGA();
- bool setFromResource(GuiResourceId resourceId, uint16 flag);
- void set(Palette *sciPal, uint16 flag, bool forceRealMerge = false);
- void merge(Palette *pFrom, Palette *pTo, uint16 flag, bool forceRealMerge);
+ bool setFromResource(GuiResourceId resourceId, bool force);
+ void set(Palette *sciPal, bool force, bool forceRealMerge = false);
+ void merge(Palette *pFrom, Palette *pTo, bool force, bool forceRealMerge);
uint16 matchColor(Palette *pPal, byte r, byte g, byte b);
void getSys(Palette *pal);