cpp/openttd-patchpack/source Changeset - r3351:6022f70efed1

Changeset - r3351:6022f70efed1

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

belugas - 18 years ago 2006-03-27 14:28:56
belugas@openttd.org

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

1 file changed with 3 insertions and 3 deletions:

players.c

0 comments (0 inline, 0 general)

players.c

➞

Show inline comments

@@ @@ -45,7 +45,7 @@ void DrawPlayerFace(uint32 face, int col @@
 		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 col @@
 			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);
+			}

0 comments (0 inline, 0 general)