(svn r4136) CodeChange : Revert part of r4092 (as spotted by Tron) and clean-up a little further

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);
 			}