From e6c6e8aa966cd71a7a017413317c30506704df1b Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 8 Jan 2011 19:01:25 +1300 Subject: [PATCH] remove a bit of dumb duplication --- OpenRA.Editor/RenderUtils.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/OpenRA.Editor/RenderUtils.cs b/OpenRA.Editor/RenderUtils.cs index 43e1e58dba..62116aa760 100644 --- a/OpenRA.Editor/RenderUtils.cs +++ b/OpenRA.Editor/RenderUtils.cs @@ -96,14 +96,9 @@ namespace OpenRA.Editor public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p) { var ri = info.Traits.Get(); - string image = null; - if (ri.OverrideTileset != null) - for (int i = 0; i < ri.OverrideTileset.Length; i++) - 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 image = RenderSimple.GetImage(info, tileset.Id); + + using (var s = FileSystem.OpenWithExts(image, tileset.Extensions)) { var shp = new ShpReader(s); var bitmap = RenderShp(shp, p);