diff options
| author | Paul Gilbert | 2016-04-30 07:19:16 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-10 16:37:41 -0400 |
| commit | 210468fae9a51fabe276e8b8485145037dfcb683 (patch) | |
| tree | cd0c7a7676ada4a00e1daf5f5ce72a94dbe59195 | |
| parent | e55f634686e06ef9bfca9655b7eca5e2d74b4757 (diff) | |
| download | scummvm-rg350-210468fae9a51fabe276e8b8485145037dfcb683.tar.gz scummvm-rg350-210468fae9a51fabe276e8b8485145037dfcb683.tar.bz2 scummvm-rg350-210468fae9a51fabe276e8b8485145037dfcb683.zip | |
TITANIC: Minor palette cleanup, remove border from PET Quit view text
| -rw-r--r-- | engines/titanic/pet_control/pet_quit.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/support/video_surface.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/titanic/pet_control/pet_quit.cpp b/engines/titanic/pet_control/pet_quit.cpp index 6959160afa..218ed89812 100644 --- a/engines/titanic/pet_control/pet_quit.cpp +++ b/engines/titanic/pet_control/pet_quit.cpp @@ -35,7 +35,7 @@ bool CPetQuit::setup(CPetControl *petControl, CPetGlyphs *owner) { tempRect.moveTo(322, 407); _text.setBounds(tempRect); _text.resize(3); - _text.setHasBorder(true); + _text.setHasBorder(false); _text.setup(); Rect btnRect(0, 0, 68, 52); 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); } |