[Scummvm-cvs-logs] SF.net SVN: scummvm:[44321] scummvm/trunk/engines/scumm/gfx.cpp

[lordhoto at users.sourceforge.net]

Revision: 44321
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44321&view=rev
Author:   lordhoto
Date:     2009-09-25 00:31:46 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Attempt to fix bug #2838205 "MONKEY: Palette glitches in Amiga version" as described on the tracker item.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/gfx.cpp

Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp	2009-09-24 23:54:48 UTC (rev 44320)
+++ scummvm/trunk/engines/scumm/gfx.cpp	2009-09-25 00:31:46 UTC (rev 44321)
@@ -2754,7 +2754,7 @@
 					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 @@
 			}
 
 			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 Gdi::writeRoomColor(byte *dst, byte color) const {
-	*dst = _roomPalette[color] + _paletteMod;
+	*dst = _roomPalette[color + _paletteMod];
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.