[Scummvm-cvs-logs] SF.net SVN: scummvm:[47674] scummvm/trunk/engines/sci/graphics/palette.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 47674
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47674&view=rev
Author:   m_kiewitz
Date:     2010-01-29 16:26:40 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
SCI: removing bit 1 support (was introduced because of problems in sci1.1 games, isnt valid anymore), fixes kq5cd

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/palette.cpp

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-29 16:25:18 UTC (rev 47673)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-29 16:26:40 UTC (rev 47674)
@@ -227,8 +227,8 @@
 		for (i = 1 ; i < 255; i++) {
 			if (!pFrom->colors[i].used)// color is not used - so skip it
 				continue;
-			// forced palette merging or dest color is not used yet or bit 1 of new color is set
-			if (force || (!pTo->colors[i].used) || (pFrom->colors[i].used & 2)) {
+			// forced palette merging or dest color is not used yet
+			if (force || (!pTo->colors[i].used)) {
 				pTo->colors[i].used = pFrom->colors[i].used;
 				pTo->colors[i].r = pFrom->colors[i].r;
 				pTo->colors[i].g = pFrom->colors[i].g;


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