# HG changeset patch # User nemo # Date 1294069550 18000 # Node ID 76315fdfb7a5779045b6cb7d5ffb3ab72498044a # Parent 9c7d5f802618d8243dce0100b59afa2e2f160198 Apply RGBA consistently in Tint diff -r 9c7d5f802618 -r 76315fdfb7a5 hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Sun Jan 02 19:30:16 2011 +0100 +++ b/hedgewars/uGearsRender.pas Mon Jan 03 10:45:50 2011 -0500 @@ -186,7 +186,7 @@ if (Gear^.State and gstHHDeath) <> 0 then begin DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos); - Tint(HH^.Team^.Clan^.Color); + Tint(HH^.Team^.Clan^.Color shl 8 or $FF); DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos + 8); Tint($FF, $FF, $FF, $FF); exit @@ -353,7 +353,7 @@ i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle); if HatTex^.w > 64 then begin - Tint(HH^.Team^.Clan^.Color); + Tint(HH^.Team^.Clan^.Color shl 8 or $FF); DrawRotatedTextureF(HatTex, 1.0, -1.0, -6.0, ox, oy, 32, i, 32, 32, i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle); Tint($FF, $FF, $FF, $FF) @@ -383,7 +383,7 @@ 32); if HatTex^.w > 64 then begin - Tint(HH^.Team^.Clan^.Color); + Tint(HH^.Team^.Clan^.Color shl 8 or $FF); DrawTextureF(HatTex, 1, sx, @@ -705,7 +705,7 @@ 32); if HatTex^.w > 64 then begin - Tint(HH^.Team^.Clan^.Color); + Tint(HH^.Team^.Clan^.Color shl 8 or $FF); DrawTextureF(HatTex, HatVisibility, sx, @@ -729,7 +729,7 @@ 32); if HatTex^.w > 64 then begin - Tint(HH^.Team^.Clan^.Color); + Tint(HH^.Team^.Clan^.Color shl 8 or $FF); DrawTextureF(HatTex, HatVisibility, sx, diff -r 9c7d5f802618 -r 76315fdfb7a5 hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Sun Jan 02 19:30:16 2011 +0100 +++ b/hedgewars/uWorld.pas Mon Jan 03 10:45:50 2011 -0500 @@ -733,7 +733,7 @@ highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500); if highlight then - Tint(Clan^.Color); + Tint(Clan^.Color shl 8 or $FF); // draw name DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY, NameTagTex);