From 1c228c488e765fc3e0e19dbcc91b3c40d4712697 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Sun, 24 Jul 2016 11:35:10 -0500
Subject: SCI32: Fix bad VMD palettes in GK2

---
 engines/sci/graphics/video32.cpp | 13 +++++++++++--
 engines/sci/graphics/video32.h   |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index dfddac1036..dd841f5b4c 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -348,6 +348,12 @@ void VMDPlayer::renderFrame() const {
 	if (dirtyPalette) {
 		Palette palette;
 		palette.timestamp = g_sci->getTickCount();
+		for (uint16 i = 0; i < _startColor; ++i) {
+			palette.colors[i].used = false;
+		}
+		for (uint16 i = _endColor; i < 256; ++i) {
+			palette.colors[i].used = false;
+		}
 		if (_blackPalette) {
 			for (uint16 i = _startColor; i <= _endColor; ++i) {
 				palette.colors[i].r = palette.colors[i].g = palette.colors[i].b = 0;
@@ -398,9 +404,12 @@ void VMDPlayer::fillPalette(Palette &palette) const {
 #pragma mark -
 #pragma mark VMDPlayer - Palette
 
-void VMDPlayer::restrictPalette(const uint8 startColor, const uint8 endColor) {
+void VMDPlayer::restrictPalette(const uint8 startColor, const int16 endColor) {
 	_startColor = startColor;
-	_endColor = endColor;
+	// At least GK2 sends 256 as the end color, which is wrong,
+	// but works in the original engine as the storage size is 4 bytes
+	// and used values are clamped to 0-255
+	_endColor = MIN((int16)255, endColor);
 }
 
 } // End of namespace Sci
diff --git a/engines/sci/graphics/video32.h b/engines/sci/graphics/video32.h
index cf863ba41d..7033f7c647 100644
--- a/engines/sci/graphics/video32.h
+++ b/engines/sci/graphics/video32.h
@@ -233,7 +233,7 @@ public:
 	 * Restricts use of the system palette by VMD playback to
 	 * the given range of palette indexes.
 	 */
-	void restrictPalette(const uint8 startColor, const uint8 endColor);
+	void restrictPalette(const uint8 startColor, const int16 endColor);
 
 private:
 	/**
-- 
cgit v1.2.3