[Scummvm-cvs-logs] SF.net SVN: scummvm: [26942] scummvm/trunk/engines/sword1/screen.cpp

[sev at users.sourceforge.net]

Revision: 26942
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26942&view=rev
Author:   sev
Date:     2007-05-26 09:17:31 -0700 (Sat, 26 May 2007)

Log Message:
-----------
Slighty modified patch #1701058: "Correct some graphical glitches for 
Brocken Sword 1 Mac"

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/screen.cpp

Modified: scummvm/trunk/engines/sword1/screen.cpp
===================================================================
--- scummvm/trunk/engines/sword1/screen.cpp	2007-05-26 15:59:54 UTC (rev 26941)
+++ scummvm/trunk/engines/sword1/screen.cpp	2007-05-26 16:17:31 UTC (rev 26942)
@@ -136,6 +136,12 @@
 	uint8 *palData = (uint8*)_resMan->openFetchRes(id);
 	if (start == 0) // force color 0 to black
 		palData[0] = palData[1] = palData[2] = 0;
+	
+	if (SwordEngine::_systemVars.isMac) {  // see bug #1701058
+		if (start != 0 && start + length == 256) // and force color 255 to black as well
+			palData[(length-1)*3+0] = palData[(length-1)*3+1] = palData[(length-1)*3+2] = 0;
+	}
+
 	for (uint32 cnt = 0; cnt < length; cnt++) {
 		_targetPalette[(start + cnt) * 4 + 0] = palData[cnt * 3 + 0] << 2;
 		_targetPalette[(start + cnt) * 4 + 1] = palData[cnt * 3 + 1] << 2;
@@ -358,8 +364,9 @@
 
 		for (uint16 cnty = 0; cnty < _scrnSizeY; cnty++)
 			for (uint16 cntx = 0; cntx < _scrnSizeX; cntx++) {
-				if (*src)
-					*dest = *src;
+				if (*src = 0)
+					if (!SwordEngine::_systemVars.isMac || *src != 255) // see bug #1701058
+						*dest = *src;
 				dest++;
 				src++;
 			}


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