diff options
| author | Paul Gilbert | 2016-04-30 07:15:31 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-10 16:37:40 -0400 |
| commit | e55f634686e06ef9bfca9655b7eca5e2d74b4757 (patch) | |
| tree | 5932273f471454277d59f6aabd3d2bf3526690f2 | |
| parent | 9205f22a43e6e5ae9a63012fe3ad545150a90b34 (diff) | |
| download | scummvm-rg350-e55f634686e06ef9bfca9655b7eca5e2d74b4757.tar.gz scummvm-rg350-e55f634686e06ef9bfca9655b7eca5e2d74b4757.tar.bz2 scummvm-rg350-e55f634686e06ef9bfca9655b7eca5e2d74b4757.zip | |
TITANIC: Fix palette usage in changePixel
| -rw-r--r-- | engines/titanic/support/video_surface.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp index cdf9e228a7..e5a1e3a998 100644 --- a/engines/titanic/support/video_surface.cpp +++ b/engines/titanic/support/video_surface.cpp @@ -362,24 +362,25 @@ uint16 OSVideoSurface::getPixel(const Common::Point &pt) { void OSVideoSurface::changePixel(uint16 *pixelP, uint16 *color, byte srcVal, bool remapFlag) { assert(getPixelDepth() == 2); - const Graphics::PixelFormat &format = _ddSurface->getFormat(); - + const Graphics::PixelFormat &destFormat = _ddSurface->getFormat(); + const Graphics::PixelFormat srcFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); + // Get the color byte r, g, b; - format.colorToRGB(*color, r, g, b); + srcFormat.colorToRGB(*color, r, g, b); if (remapFlag) { - r = _palette1[31 - srcVal][r >> 2] << 2; - g = _palette1[31 - srcVal][g >> 2] << 2; - b = _palette1[31 - srcVal][b >> 2] << 2; + r = _palette1[31 - srcVal][r >> 3] << 3; + g = _palette1[31 - srcVal][g >> 3] << 3; + b = _palette1[31 - srcVal][b >> 3] << 3; } byte r2, g2, b2; - format.colorToRGB(*pixelP, r2, g2, b2); - r2 = _palette1[srcVal][r2 >> 2] << 2; - g2 = _palette1[srcVal][g2 >> 2] << 2; - b2 = _palette1[srcVal][b2 >> 2] << 2; + destFormat.colorToRGB(*pixelP, r2, g2, b2); + r2 = _palette1[srcVal][r2 >> 3] << 3; + g2 = _palette1[srcVal][g2 >> 3] << 3; + b2 = _palette1[srcVal][b2 >> 3] << 3; - *pixelP = format.RGBToColor(r + r2, g + g2, b + b2); + *pixelP = destFormat.RGBToColor(r + r2, g + g2, b + b2); } void OSVideoSurface::shiftColors() { |