aboutsummaryrefslogtreecommitdiff
path: root/scumm/palette.cpp
diff options
context:
space:
mode:
authorMax Horn2005-04-26 15:42:35 +0000
committerMax Horn2005-04-26 15:42:35 +0000
commit3a4dafeaa37226d652eb2e00f92ab73d0acc517e (patch)
treeefc0881f380b13446244f49d4653b7e1775ef4f6 /scumm/palette.cpp
parentab5355831540e802e838b8872e09db3c3ea97b7a (diff)
downloadscummvm-rg350-3a4dafeaa37226d652eb2e00f92ab73d0acc517e.tar.gz
scummvm-rg350-3a4dafeaa37226d652eb2e00f92ab73d0acc517e.tar.bz2
scummvm-rg350-3a4dafeaa37226d652eb2e00f92ab73d0acc517e.zip
desaturatePalette is V8 specific
svn-id: r17827
Diffstat (limited to 'scumm/palette.cpp')
-rw-r--r--scumm/palette.cpp4
1 files changed, 2 insertions, 2 deletions
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;
}