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

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Mon Oct 26 15:49:01 CET 2009


Revision: 45407
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45407&view=rev
Author:   Kirben
Date:     2009-10-26 14:49:01 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
Fix charset color in PCE version of Loom.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/charset.cpp
    scummvm/trunk/engines/scumm/palette.cpp

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2009-10-26 13:22:05 UTC (rev 45406)
+++ scummvm/trunk/engines/scumm/charset.cpp	2009-10-26 14:49:01 UTC (rev 45407)
@@ -971,12 +971,12 @@
 			if ((bits & revBitMask(x % 8)) && y + drawTop >= 0) {
 				if (bitDepth == 2) {
 					if (_shadowMode != kNoShadowMode) {
-						WRITE_UINT16(dst + 2, _shadowColor);
-						WRITE_UINT16(dst + s.pitch, _shadowColor);
+						WRITE_UINT16(dst + 2, _vm->_16BitPalette[_shadowColor]);
+						WRITE_UINT16(dst + s.pitch, _vm->_16BitPalette[_shadowColor]);
 						if (_shadowMode != kFMTOWNSShadowMode)
-							WRITE_UINT16(dst + s.pitch + 2, _shadowColor);
+							WRITE_UINT16(dst + s.pitch + 2, _vm->_16BitPalette[_shadowColor]);
 					}
-					WRITE_UINT16(dst, _color);
+					WRITE_UINT16(dst, _vm->_16BitPalette[_color]);
 				} else {
 					if (_shadowMode != kNoShadowMode) {
 						*(dst + 1) = _shadowColor;

Modified: scummvm/trunk/engines/scumm/palette.cpp
===================================================================
--- scummvm/trunk/engines/scumm/palette.cpp	2009-10-26 13:22:05 UTC (rev 45406)
+++ scummvm/trunk/engines/scumm/palette.cpp	2009-10-26 14:49:01 UTC (rev 45407)
@@ -261,9 +261,8 @@
 	}
 
 	if (_game.features & GF_16BIT_COLOR) {
-		for (int i = firstIndex; i < firstIndex + numcolor - 1; ++i) {
+		for (int i = firstIndex; i < firstIndex + numcolor; ++i)
 			_16BitPalette[i] = get16BitColor(_currentPalette[i * 3 + 0], _currentPalette[i * 3 + 1], _currentPalette[i * 3 + 2]);
-		}
 	}
 	setDirtyColors(firstIndex, firstIndex + numcolor - 1);
 }


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




More information about the Scummvm-git-logs mailing list