aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorChris Apers2003-05-02 09:36:58 +0000
committerChris Apers2003-05-02 09:36:58 +0000
commit5eace23e11977465067a806057ebf6f602713e00 (patch)
tree1e6d0b3f72b0ca911a580c4b2381e059c9029be2 /common
parente76b56aa6f7d690e8df7aa9757f6803ee8c6d1e1 (diff)
downloadscummvm-rg350-5eace23e11977465067a806057ebf6f602713e00.tar.gz
scummvm-rg350-5eace23e11977465067a806057ebf6f602713e00.tar.bz2
scummvm-rg350-5eace23e11977465067a806057ebf6f602713e00.zip
Change __PALM_OS__ to NEWGUI_256, more generic
svn-id: r7260
Diffstat (limited to 'common')
-rw-r--r--common/util.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/util.cpp b/common/util.cpp
index 5a60127988..791b7e7b6d 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -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 @@ int RGBMatch(byte *palette, int r, int g, int b) {
// 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 @@ int Blend(int src, int dst, byte *palette) {
// 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