From de25bed962a1ddf789171fe72da86f202068f75a Mon Sep 17 00:00:00 2001 From: belugas Date: Mon, 27 Mar 2006 14:28:56 +0000 Subject: (svn r4136) CodeChange : Revert part of r4092 (as spotted by Tron) and clean-up a little further --- players.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'players.c') diff --git a/players.c b/players.c index 45d27f82d..2cdffd984 100644 --- a/players.c +++ b/players.c @@ -45,7 +45,7 @@ void DrawPlayerFace(uint32 face, int color, int x, int y) flag |= 2; /* draw the gradient */ - DrawSprite(GENERAL_SPRITE_COLOR(color) | PALETTE_MODIFIER_COLOR | SPR_GRADIENT, x, y); + DrawSprite(GENERAL_SPRITE_COLOR(color) + SPRITE_PALETTE(SPR_GRADIENT), x, y); /* draw the cheeks */ DrawSprite(cheeks_table[flag&3], x, y); @@ -76,11 +76,11 @@ void DrawPlayerFace(uint32 face, int color, int x, int y) if (!(flag & 1)) { DrawSprite(high+((val1 * 12 >> 4) + SPRITE_PALETTE(0x32B)), x, y); } else { - DrawSprite(high+(val1 + (0x337 | PALETTE_MODIFIER_COLOR)), x, y); + DrawSprite(high+(val1 + SPRITE_PALETTE(0x337)), x, y); } } else { if (!(flag & 1)) { - DrawSprite(high+(val1 + SPRITE_PALETTE(0x337)), x, y); + DrawSprite(high+((val1 * 11 >> 4) + SPRITE_PALETTE(0x39A)), x, y); } else { DrawSprite(high+(val1 + SPRITE_PALETTE(0x3B8)), x, y); } -- cgit v1.2.3-54-g00ecf