From 1e8047a5d221cb9328bfa13efa9460d51d3bfdc4 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 12 Mar 2007 23:03:30 +0000
Subject: Fix xmap regression, when drawing wiz images.

svn-id: r26119
---
 engines/scumm/he/wiz_he.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/scumm/he')

diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index b555dfeb65..d9ece1cb1c 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -553,7 +553,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C
 	int h, w, xoff, dstInc;
 
 	if (type == kWizXMap) {
-		assert(palPtr != 0 && xmapPtr != 0);
+		assert(xmapPtr != 0);
 	}
 	if (type == kWizRMap) {
 		assert(palPtr != 0);
@@ -619,7 +619,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C
 					}
 					while (code--) {
 						if (type == kWizXMap) {
-							*dstPtr = xmapPtr[palPtr[*dataPtr] * 256 + *dstPtr];
+							*dstPtr = xmapPtr[*dataPtr * 256 + *dstPtr];
 						}
 						if (type == kWizRMap) {
 							*dstPtr = palPtr[*dataPtr];
@@ -647,7 +647,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C
 					}
 					while (code--) {
 						if (type == kWizXMap) {
-							*dstPtr = xmapPtr[palPtr[*dataPtr++] * 256 + *dstPtr];
+							*dstPtr = xmapPtr[*dataPtr++ * 256 + *dstPtr];
 						}
 						if (type == kWizRMap) {
 							*dstPtr = palPtr[*dataPtr++];
-- 
cgit v1.2.3