From 79a5966af7665f02e0f9e674e1e1b6e614cab0bc Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 17 Jan 2010 12:42:26 +1300 Subject: [PATCH] remove duplication --- OpenRa.Game/Graphics/Minimap.cs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/OpenRa.Game/Graphics/Minimap.cs b/OpenRa.Game/Graphics/Minimap.cs index a4b7501b9d..d9e56fdff5 100644 --- a/OpenRa.Game/Graphics/Minimap.cs +++ b/OpenRa.Game/Graphics/Minimap.cs @@ -49,18 +49,8 @@ namespace OpenRa.Graphics if (terrainTypeColors == null) { var pal = new Palette(FileSystem.Open(Game.world.Map.Theater + ".pal")); - terrainTypeColors = new[] { - Color.FromArgb(alpha, pal.GetColor(theater.ToLowerInvariant() == "snow" ? 0xe3 :0x1a)), - Color.FromArgb(alpha, pal.GetColor(0x63)), - Color.FromArgb(alpha, pal.GetColor(0x2f)), - Color.FromArgb(alpha, pal.GetColor(0x1f)), - Color.FromArgb(alpha, pal.GetColor(0x14)), - Color.FromArgb(alpha, pal.GetColor(0x64)), - Color.FromArgb(alpha, pal.GetColor(0x1f)), - Color.FromArgb(alpha, pal.GetColor(0x68)), - Color.FromArgb(alpha, pal.GetColor(0x6b)), - Color.FromArgb(alpha, pal.GetColor(0x6d)), - }; + terrainTypeColors = new[] {theater.ToLowerInvariant() == "snow" ? 0xe3 :0x1a, 0x63, 0x2f, 0x1f, 0x14, 0x64, 0x1f, 0x68, 0x6b, 0x6d } + .Select( a => Color.FromArgb(alpha, pal.GetColor(a) )).ToArray(); playerColors = Util.MakeArray( 8, b => Color.FromArgb(alpha, Chat.paletteColors[b]) ); shroudColor = Color.FromArgb(alpha, Color.Black);