diff options
| -rw-r--r-- | engines/gob/coktelvideo.cpp | 9 | ||||
| -rw-r--r-- | engines/gob/inter_v6.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/video_v6.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/engines/gob/coktelvideo.cpp b/engines/gob/coktelvideo.cpp index 2e8cd74aad..90a9531536 100644 --- a/engines/gob/coktelvideo.cpp +++ b/engines/gob/coktelvideo.cpp @@ -1549,12 +1549,13 @@ void Vmd::blit16(byte *dest, uint16 *src, int16 width, int16 height) { uint16 *s = src; for (int j = 0; j < width; j++, s++) { - byte r = ((*s & 0x7C00) >> 10) << 1; - byte g = ((*s & 0x03E0) >> 5) << 1; - byte b = ((*s & 0x001F) >> 0) << 1; + uint16 data = READ_LE_UINT16(s); + byte r = ((data & 0x7C00) >> 10); + byte g = ((data & 0x03E0) >> 5); + byte b = ((data & 0x001F) >> 0); byte dY, dU, dV; - Graphics::PaletteLUT::RGB2YUV(r << 2, g << 2, b << 2, dY, dU, dV); + Graphics::PaletteLUT::RGB2YUV(r << 3, g << 3, b << 3, dY, dU, dV); byte p = dither->dither(dY, dU, dV, j); diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index 65022ab539..8ac45fc354 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -927,7 +927,7 @@ bool Inter_v6::o6_palLoad(OpFuncParams ¶ms) { if (_gotFirstPalette) _vm->_video->_palLUT->setPalette((const byte *) _vm->_global->_pPaletteDesc->vgaPal, - Graphics::PaletteLUT::kPaletteRGB, 6); + Graphics::PaletteLUT::kPaletteRGB, 6, 0); _gotFirstPalette = true; return false; diff --git a/engines/gob/video_v6.cpp b/engines/gob/video_v6.cpp index db96986c1f..aae5d3ac12 100644 --- a/engines/gob/video_v6.cpp +++ b/engines/gob/video_v6.cpp @@ -105,7 +105,7 @@ bool Video_v6::savePalLUT(const char *target) { void Video_v6::buildPalLUT() { char text[30]; - _palLUT->setPalette(_ditherPalette, Graphics::PaletteLUT::kPaletteYUV, 8); + _palLUT->setPalette(_ditherPalette, Graphics::PaletteLUT::kPaletteYUV, 8, 0); for (int i = 0; (i < 64) && !_vm->shouldQuit(); i++) { sprintf(text, "Building palette table: %02d/63", i); |