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

remove a bit of dumb duplication

Browse Source
This commit is contained in:
Chris Forbes
2011-01-08 19:01:25 +13:00
committed by Paul Chote
parent 180d58c35a
commit e6c6e8aa96
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Editor/RenderUtils.cs
View File

@@ -96,14 +96,9 @@ namespace OpenRA.Editor
public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p) public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
{ {
var ri = info.Traits.Get<RenderSimpleInfo>(); var ri = info.Traits.Get<RenderSimpleInfo>();
string image = null; var image = RenderSimple.GetImage(info, tileset.Id);
if (ri.OverrideTileset != null)
for (int i = 0; i < ri.OverrideTileset.Length; i++) using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
if (ri.OverrideTileset[i] == tileset.Id)
image = ri.OverrideImage[i];
image = image ?? ri.Image ?? info.Name;
using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
{ {
var shp = new ShpReader(s); var shp = new ShpReader(s);
var bitmap = RenderShp(shp, p); var bitmap = RenderShp(shp, p);