From 4670e37a78409bfe9279c5d73c8d581f0d66143e Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 4 Jan 2009 00:58:45 +0000
Subject: Use slow palette color match, for 16bit color HE games for now.

svn-id: r35713
---
 engines/scumm/palette.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'engines/scumm/palette.cpp')

diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 6d6c499462..4214ab2330 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -811,12 +811,16 @@ void ScummEngine_v8::desaturatePalette(int hueScale, int satScale, int lightScal
 
 
 int ScummEngine::remapPaletteColor(int r, int g, int b, int threshold) {
-	int i;
-	int ar, ag, ab;
+	byte *pal;
+	int ar, ag, ab, i;
 	uint sum, bestsum, bestitem = 0;
 
 	int startColor = (_game.version == 8) ? 24 : 1;
-	byte *pal = _currentPalette + startColor * 3;
+	
+	if (_game.heversion >= 99)
+		pal = _hePalettes + 1024 + startColor * 3;
+	else
+		pal = _currentPalette + startColor * 3;
 
 	if (r > 255)
 		r = 255;
-- 
cgit v1.2.3