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

Force the first template variant in TTPW.

Browse Source
This commit is contained in:
Paul Chote
2015-05-10 15:17:26 +01:00
parent 443bc63fa7
commit 038847cc4c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ namespace OpenRA.Graphics
Sheet.ReleaseBuffer(); Sheet.ReleaseBuffer();
} }
public Sprite TileSprite(TerrainTile r) public Sprite TileSprite(TerrainTile r, int? variant = null)
{ {
TheaterTemplate template; TheaterTemplate template;
if (!templates.TryGetValue(r.Type, out template)) if (!templates.TryGetValue(r.Type, out template))
@@ -91,7 +91,7 @@ namespace OpenRA.Graphics
if (r.Index >= template.Stride) if (r.Index >= template.Stride)
return missingTile; return missingTile;
var start = template.Variants > 1 ? random.Next(template.Variants) : 0; var start = template.Variants > 1 ? variant.HasValue ? variant.Value : random.Next(template.Variants) : 0;
return template.Sprites[start * template.Stride + r.Index]; return template.Sprites[start * template.Stride + r.Index];
} }

2
OpenRA.Mods.Common/Widgets/TerrainTemplatePreviewWidget.cs
View File

@@ -89,7 +89,7 @@ namespace OpenRA.Mods.Common.Widgets
if (tileInfo == null) if (tileInfo == null)
continue; continue;
var sprite = worldRenderer.Theater.TileSprite(tile); var sprite = worldRenderer.Theater.TileSprite(tile, 0);
var size = new float2(sprite.Size.X * scale, sprite.Size.Y * scale); var size = new float2(sprite.Size.X * scale, sprite.Size.Y * scale);
var u = shape == TileShape.Rectangle ? x : (x - y) / 2f; var u = shape == TileShape.Rectangle ? x : (x - y) / 2f;