epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Chris Forbes
2010-01-19 15:17:02 +13:00
parent 7cb15f0232 266fc91062
commit e627c420d4
28 changed files with 564 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/Graphics/Minimap.cs
View File

@@ -51,7 +51,9 @@ namespace OpenRa.Graphics
if (terrainTypeColors == null)
{
var pal = new Palette(FileSystem.Open(world.Map.Theater + ".pal"));
terrainTypeColors = new[] {theater.ToLowerInvariant() == "snow" ? 0xe3 :0x1a, 0x63, 0x2f, 0x1f, 0x14, 0x64, 0x1f, 0x68, 0x6b, 0x6d }
terrainTypeColors = new[] {
theater.ToLowerInvariant() == "snow" ? 0xe3 :0x1a,
0x63, 0x2f, 0x1f, 0x14, 0x64, 0x1f, 0x68, 0x6b, 0x6d, 0x88 }
.Select( a => Color.FromArgb(alpha, pal.GetColor(a) )).ToArray();
playerColors = Util.MakeArray<Color>( 8, b => Color.FromArgb(alpha, Chat.paletteColors[b]) );

2
OpenRa.Game/Graphics/SequenceProvider.cs
View File

@@ -107,8 +107,6 @@ namespace OpenRa.Graphics
public static Sprite GetImageFromCollection(Renderer renderer,string collection, string image)
{
// Cached sprite
if (cachedSprites.ContainsKey(collection) && cachedSprites[collection].ContainsKey(image))
return cachedSprites[collection][image];