diff options
| -rw-r--r-- | scumm/intern.h | 4 | ||||
| -rw-r--r-- | scumm/palette.cpp | 4 | ||||
| -rw-r--r-- | scumm/scumm.h | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 7e19084005..994fcef753 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -1307,6 +1307,10 @@ protected: virtual int getObjectIdFromOBIM(const byte *obim); + + void desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor); + + /* Version 8 script opcodes */ void o8_mod(); void o8_wait(); diff --git a/scumm/palette.cpp b/scumm/palette.cpp index 1ae057543f..3085c98f12 100644 --- a/scumm/palette.cpp +++ b/scumm/palette.cpp @@ -706,7 +706,7 @@ static int HSL2RGBHelper(int n1, int n2, int hue) { * components of the palette colors. It's used in CMI when Guybrush * walks from the beach towards the swamp. */ -void ScummEngine::desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor) { +void ScummEngine_v8::desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor) { if (startColor <= endColor) { const byte *cptr; @@ -925,8 +925,8 @@ const byte *ScummEngine::getPalettePtr(int palindex, int room) { cptr += _CLUT_offs; } else { cptr = findPalInPals(cptr + _PALS_offs, palindex); + assert(cptr); } - assert(cptr); return cptr; } diff --git a/scumm/scumm.h b/scumm/scumm.h index 3984d6d706..176d926480 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -973,7 +973,6 @@ protected: void setupShadowPalette(int slot, int redScale, int greenScale, int blueScale, int startColor, int endColor); void setupShadowPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor, int start, int end); virtual void darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor); - void desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor); void setupCursor(); |