aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he
diff options
context:
space:
mode:
authorTravis Howell2009-06-04 11:03:45 +0000
committerTravis Howell2009-06-04 11:03:45 +0000
commitfdbc49ab5f4b9320e4cdac8edd427304910d8235 (patch)
tree505281a407caa1f7a53602d60bcfe370d935b95c /engines/scumm/he
parenta45b902716aa3a86e56efaefeee1d6ae3113fbd1 (diff)
downloadscummvm-rg350-fdbc49ab5f4b9320e4cdac8edd427304910d8235.tar.gz
scummvm-rg350-fdbc49ab5f4b9320e4cdac8edd427304910d8235.tar.bz2
scummvm-rg350-fdbc49ab5f4b9320e4cdac8edd427304910d8235.zip
Fix the color of Poodles Galore's finger nails in Spy Fox 3.
svn-id: r41162
Diffstat (limited to 'engines/scumm/he')
-rw-r--r--engines/scumm/he/script_v100he.cpp6
-rw-r--r--engines/scumm/he/script_v90he.cpp6
2 files changed, 2 insertions, 10 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index d588c26a77..90f2764b3d 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -2617,11 +2617,7 @@ void ScummEngine_v100he::o100_getPaletteData() {
r = MAX(0, r);
r = MIN(r, 255);
if (_game.features & GF_16BIT_COLOR) {
- uint32 ar = ((r >> 3) << 10) & 0xFFFF;
- uint32 ag = ((g >> 3) << 5) & 0xFFFF;
- uint32 ab = ((b >> 3) << 0) & 0xFFFF;
- uint32 col = ar | ag | ab;
- push(col);
+ push(get16BitColor(r, g, b));
} else {
push(getHEPaletteSimilarColor(1, r, g, 10, 245));
}
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index 212ba69bdc..c6b919f554 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -2147,11 +2147,7 @@ void ScummEngine_v90he::o90_getPaletteData() {
r = MIN(r, 255);
if (_game.features & GF_16BIT_COLOR) {
- uint32 ar = ((r >> 3) << 10) & 0xFFFF;
- uint32 ag = ((g >> 3) << 5) & 0xFFFF;
- uint32 ab = ((b >> 3) << 0) & 0xFFFF;
- uint32 col = ar | ag | ab;
- push(col);
+ push(get16BitColor(r, g, b));
} else {
push(getHEPaletteSimilarColor(1, r, g, 10, 245));
}