diff options
author | Colin Snover | 2016-08-11 20:46:17 -0500 |
---|---|---|
committer | Colin Snover | 2016-08-11 20:50:33 -0500 |
commit | c8affb54cca259f37522216bad739be085bf9caa (patch) | |
tree | da1762ae2bdd87e9b6f8030dce1d30d2c6a208be | |
parent | 93b06f4a9e08de281ee7eb9c780ceac147c3fb23 (diff) | |
download | scummvm-rg350-c8affb54cca259f37522216bad739be085bf9caa.tar.gz scummvm-rg350-c8affb54cca259f37522216bad739be085bf9caa.tar.bz2 scummvm-rg350-c8affb54cca259f37522216bad739be085bf9caa.zip |
SCI32: Fix KQ7 1.51 video background
-rw-r--r-- | engines/sci/graphics/video32.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp index 0dde86a65d..380ab804d7 100644 --- a/engines/sci/graphics/video32.cpp +++ b/engines/sci/graphics/video32.cpp @@ -371,7 +371,25 @@ void AVIPlayer::renderFrame() const { return; } - bitmap.getBuffer().copyRectToSurface(*surface, 0, 0, Common::Rect(surface->w, surface->h)); + // KQ7 1.51 encodes videos with palette entry 0 as white, which makes + // the area around the video turn white too, since it is coded to use + // palette entry 0. This happens to work in the original game because + // the video is rendered by VfW, not in the engine itself. To fix this, + // we just modify the incoming pixel data from the video so if a pixel + // is using entry 0, we change it to use entry 255, which is guaranteed + // to always be white + if (getSciVersion() == SCI_VERSION_2_1_EARLY && g_sci->getGameId() == GID_KQ7) { + uint8 *target = bitmap.getPixels(); + uint8 *source = (uint8 *)surface->getPixels(); + uint8 *end = (uint8 *)surface->getPixels() + surface->w * surface->h; + + while (source != end) { + uint8 value = *source++; + *target++ = value == 0 ? 255 : value; + } + } else { + bitmap.getBuffer().copyRectToSurface(*surface, 0, 0, Common::Rect(surface->w, surface->h)); + } const bool dirtyPalette = _decoder->hasDirtyPalette(); if (dirtyPalette) { @@ -384,6 +402,9 @@ void AVIPlayer::renderFrame() const { palette.colors[i].used = true; } + // Prevent KQ7 1.51 from setting entry 0 to white + palette.colors[0].used = false; + g_sci->_gfxPalette32->submit(palette); } |