From 94e75b8b6d24f3ad0e0dc9f4e6e789948e31f48e Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 22 Nov 2009 08:36:14 +0000
Subject: Fix charset palette in PCE version of Loom, based on information from
 Tobias.

svn-id: r46064
---
 engines/scumm/gfx.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 651bbec1ab..2d284e8e7c 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -643,9 +643,14 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
 			for (int h = 0; h < height * m; ++h) {
 				for (int w = 0; w < width * m; ++w) {
 					uint16 tmp = *textPtr++;
-					if (tmp == CHARSET_MASK_TRANSPARENCY)
+					if (tmp == CHARSET_MASK_TRANSPARENCY) {
 						tmp = READ_UINT16(srcPtr);
-					WRITE_UINT16(dstPtr, tmp); dstPtr += 2;
+						WRITE_UINT16(dstPtr, tmp); dstPtr += 2;
+					} else if (_game.heversion != 0) {
+						error ("16Bit Color HE Game using old charset");
+					} else {
+						WRITE_UINT16(dstPtr, _16BitPalette[tmp]); dstPtr += 2;
+					}
 					srcPtr += vs->bytesPerPixel;
 				}
 				srcPtr += vsPitch;
-- 
cgit v1.2.3