aboutsummaryrefslogtreecommitdiff
path: root/scumm/palette.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-04-19 07:06:05 +0000
committerTravis Howell2005-04-19 07:06:05 +0000
commitad96d7fdb109c26474a0caefda2dba17c18ac9d6 (patch)
tree9f1e5adc8665dfeec8224f2292324f31a5651d96 /scumm/palette.cpp
parentfd6c9ad9d36144c0b68447840b19ace420857656 (diff)
downloadscummvm-rg350-ad96d7fdb109c26474a0caefda2dba17c18ac9d6.tar.gz
scummvm-rg350-ad96d7fdb109c26474a0caefda2dba17c18ac9d6.tar.bz2
scummvm-rg350-ad96d7fdb109c26474a0caefda2dba17c18ac9d6.zip
Actually applies to all SCUMM 5/6 games.
svn-id: r17679
Diffstat (limited to 'scumm/palette.cpp')
-rw-r--r--scumm/palette.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 4710bc4c26..052d2f2acf 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -586,6 +586,13 @@ void ScummEngine::setupShadowPalette(int redScale, int greenScale, int blueScale
// from within Room 23 (the big machine), as it has no shadow effects
// and thus doesn't result in any visual differences.
+ int max;
+ if (_version >= 5 && _version <= 6) {
+ max = 252;
+ } else {
+ max = 255;
+ }
+
if (_gameId == GID_SAMNMAX) {
for (i = 0; i < 256; i++)
_shadowPalette[i] = i;
@@ -605,12 +612,12 @@ void ScummEngine::setupShadowPalette(int redScale, int greenScale, int blueScale
int ar, ag, ab;
uint sum, bestsum, bestitem = 0;
- if (r > 255)
- r = 255;
- if (g > 255)
- g = 255;
- if (b > 255)
- b = 255;
+ if (r > max)
+ r = max;
+ if (g > max)
+ g = max;
+ if (b > max)
+ b = max;
bestsum = 32000;
@@ -644,8 +651,8 @@ void ScummEngine::darkenPalette(int redScale, int greenScale, int blueScale, int
return;
int max;
- if ((_features & GF_FMTOWNS) && (_version == 5)) {
- max = 63;
+ if (_version >= 5 && _version <= 6 && _heversion <= 60) {
+ max = 252;
} else {
max = 255;
}