[Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.56,1.57 interface.cpp,1.131,1.132

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12690

Modified Files:
	gfx.cpp interface.cpp 
Log Message:
Fix bug #1256368 "ITE: Black pixels drawn as white at sanctuary gate"


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- gfx.cpp	29 Jul 2005 17:57:40 -0000	1.56
+++ gfx.cpp	11 Aug 2005 19:11:15 -0000	1.57
@@ -174,6 +174,10 @@
 		ppal[3] = 0;
 	}
 
+	// Make 256th color black. See bug #1256368
+	if (_vm->getFeatures() & GF_MAC_RESOURCES)
+		memset(&_currentPal[255 * 4], 0, 4);
+
 	_system->setPalette(_currentPal, 0, PAL_ENTRIES);
 }
 
@@ -233,6 +237,10 @@
 		ppal[3] = 0;
 	}
 
+	// Make 256th color black. See bug #1256368
+	if (_vm->getFeatures() & GF_MAC_RESOURCES)
+		memset(&_currentPal[255 * 4], 0, 4);
+
 	_system->setPalette(_currentPal, 0, PAL_ENTRIES);
 }
 
@@ -303,6 +311,10 @@
 		}
 	}
 
+	// Make 256th color black. See bug #1256368
+	if (_vm->getFeatures() & GF_MAC_RESOURCES)
+		memset(&_currentPal[255 * 4], 0, 4);
+
 	_system->setPalette(_currentPal, 0, PAL_ENTRIES);
 }
 

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- interface.cpp	11 Aug 2005 16:13:10 -0000	1.131
+++ interface.cpp	11 Aug 2005 19:11:15 -0000	1.132
@@ -579,11 +579,6 @@
 				drawVerbPanel(backBuffer, _verbTypeToPanelButton[i]);
 			}
 		}
-
-		// Mac panel background has one line skipped, so overdraw it
-		if (_vm->getFeatures() & GF_MAC_RESOURCES) {
-			backBuffer->drawLine(51, 151, 165, 151, 0);
-		}
 	} else if (_panelMode == kPanelConverse) {
 		_conversePanel.getRect(rect);
 		backBuffer->blit(rect, _conversePanel.image);