aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/support/video_surface.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-30 07:19:16 -0400
committerPaul Gilbert2016-07-10 16:37:41 -0400
commit210468fae9a51fabe276e8b8485145037dfcb683 (patch)
treecd0c7a7676ada4a00e1daf5f5ce72a94dbe59195 /engines/titanic/support/video_surface.cpp
parente55f634686e06ef9bfca9655b7eca5e2d74b4757 (diff)
downloadscummvm-rg350-210468fae9a51fabe276e8b8485145037dfcb683.tar.gz
scummvm-rg350-210468fae9a51fabe276e8b8485145037dfcb683.tar.bz2
scummvm-rg350-210468fae9a51fabe276e8b8485145037dfcb683.zip
TITANIC: Minor palette cleanup, remove border from PET Quit view text
Diffstat (limited to 'engines/titanic/support/video_surface.cpp')
-rw-r--r--engines/titanic/support/video_surface.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp
index e5a1e3a998..e6b2fa7958 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -192,12 +192,12 @@ void OSVideoSurface::setupPalette(byte palette[32][32], byte val) {
v *= base;
uint v2 = (v >> 36);
v = ((v2 >> 31) + v2) & 0xff;
- palette[idx1][idx2] = v;
+ palette[idx1][idx2] = v << 3;
if (val != 0xff && v != idx2) {
v = 0x80808081 * v * val;
v2 = v >> 39;
- palette[idx1][idx2] = (v2 >> 31) + v2;
+ palette[idx1][idx2] = ((v2 >> 31) + v2) << 3;
}
}
}
@@ -369,16 +369,16 @@ void OSVideoSurface::changePixel(uint16 *pixelP, uint16 *color, byte srcVal, boo
byte r, g, b;
srcFormat.colorToRGB(*color, r, g, b);
if (remapFlag) {
- r = _palette1[31 - srcVal][r >> 3] << 3;
- g = _palette1[31 - srcVal][g >> 3] << 3;
- b = _palette1[31 - srcVal][b >> 3] << 3;
+ r = _palette1[31 - srcVal][r >> 3];
+ g = _palette1[31 - srcVal][g >> 3];
+ b = _palette1[31 - srcVal][b >> 3];
}
byte r2, g2, b2;
destFormat.colorToRGB(*pixelP, r2, g2, b2);
- r2 = _palette1[srcVal][r2 >> 3] << 3;
- g2 = _palette1[srcVal][g2 >> 3] << 3;
- b2 = _palette1[srcVal][b2 >> 3] << 3;
+ r2 = _palette1[srcVal][r2 >> 3];
+ g2 = _palette1[srcVal][g2 >> 3];
+ b2 = _palette1[srcVal][b2 >> 3];
*pixelP = destFormat.RGBToColor(r + r2, g + g2, b + b2);
}