[Scummvm-cvs-logs] CVS: scummvm/common util.cpp,1.10,1.11

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv26109

Modified Files:
	util.cpp 
Log Message:
Change __PALM_OS__ to NEWGUI_256, more generic

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- util.cpp	30 Apr 2003 12:43:56 -0000	1.10
+++ util.cpp	2 May 2003 09:36:58 -0000	1.11
@@ -24,7 +24,7 @@
 //
 // 8-bit alpha blending routines
 //
-#ifndef __PALM_OS__
+#ifndef NEWGUI_256
 static int BlendCache[256][256];
 #endif
 //
@@ -55,7 +55,7 @@
 // Blend two 8 bit colors into a third, all colors being defined by palette indices.
 //
 int Blend(int src, int dst, byte *palette) {
-#ifndef __PALM_OS__
+#ifndef NEWGUI_256
 	int r, g, b;
 	int alpha = 128;	// Level of transparency [0-256]
 	byte *srcpal = palette + (dst * 3);
@@ -86,7 +86,7 @@
 // Reset the blending cache
 //
 void ClearBlendCache(byte *palette, int weight) {
-#ifndef __PALM_OS__
+#ifndef NEWGUI_256
 	for (int i = 0; i < 256; i++)
 		for (int j = 0 ; j < 256 ; j++)
 //			BlendCache[i][j] = i;	// No alphablending