From 506fceeb9d63833cc62dbc3a6061a1d5aa84cd78 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 25 Sep 2009 00:31:46 +0000
Subject: Attempt to fix bug #2838205 "MONKEY: Palette glitches in Amiga
 version" as described on the tracker item.

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

(limited to 'engines/scumm')

diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index fd298c2980..0f46ac68c5 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -2754,7 +2754,7 @@ void Gdi::drawStripEGA(byte *dst, int dstPitch, const byte *src, int height) con
 					run = *src++;
 				}
 				for (z = 0; z < run; z++) {
-					*(dst + y * dstPitch + x) = (z & 1) ? _roomPalette[color & 0xf] + _paletteMod : _roomPalette[color >> 4] + _paletteMod;
+					*(dst + y * dstPitch + x) = (z & 1) ? _roomPalette[(color & 0xf) + _paletteMod] : _roomPalette[(color >> 4) + _paletteMod];
 
 					y++;
 					if (y >= height) {
@@ -2784,7 +2784,7 @@ void Gdi::drawStripEGA(byte *dst, int dstPitch, const byte *src, int height) con
 			}
 
 			for (z = 0; z < run; z++) {
-				*(dst + y * dstPitch + x) = _roomPalette[color & 0xf] + _paletteMod;
+				*(dst + y * dstPitch + x) = _roomPalette[(color & 0xf) + _paletteMod];
 
 				y++;
 				if (y >= height) {
@@ -3189,7 +3189,7 @@ void Gdi16Bit::writeRoomColor(byte *dst, byte color) const {
 }
 
 void Gdi::writeRoomColor(byte *dst, byte color) const {
-	*dst = _roomPalette[color] + _paletteMod;
+	*dst = _roomPalette[color + _paletteMod];
 }
 
 
-- 
cgit v1.2.3