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

Rename Image -> Images.

Browse Source
This commit is contained in:
Paul Chote
2015-03-30 20:18:22 +01:00
parent 4be5334a0e
commit 84e85d8a5d
20 changed files with 3587 additions and 3583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Graphics/Theater.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Graphics
{
var variants = new List<Sprite[]>();
foreach (var i in t.Value.Image)
foreach (var i in t.Value.Images)
{
var allFrames = frameCache[i];
var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
@@ -73,7 +73,7 @@ namespace OpenRA.Graphics
if (tileset.IgnoreTileSpriteOffsets)
allSprites = allSprites.Select(s => new Sprite(s.Sheet, s.Bounds, float2.Zero, s.Channel, s.BlendMode));
templates.Add(t.Value.Id, new TheaterTemplate(allSprites.ToArray(), variants.First().Count(), t.Value.Image.Length));
templates.Add(t.Value.Id, new TheaterTemplate(allSprites.ToArray(), variants.First().Count(), t.Value.Images.Length));
}
// 1x1px transparent tile

6
OpenRA.Game/Map/TileSet.cs
View File

@@ -68,7 +68,7 @@ namespace OpenRA
static readonly TerrainTemplateInfo Default = new TerrainTemplateInfo(0, new string[] { null }, int2.Zero, null);
public readonly ushort Id;
public readonly string[] Image;
public readonly string[] Images;
public readonly int[] Frames;
public readonly int2 Size;
public readonly bool PickAny;
@@ -76,10 +76,10 @@ namespace OpenRA
TerrainTileInfo[] tileInfo;
public TerrainTemplateInfo(ushort id, string[] image, int2 size, byte[] tiles)
public TerrainTemplateInfo(ushort id, string[] images, int2 size, byte[] tiles)
{
this.Id = id;
this.Image = image;
this.Images = images;
this.Size = size;
}