From 288de5284e15fe4e577d6d86d65987e53f579105 Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Mon, 11 Jan 2016 00:07:38 +0200 Subject: [PATCH] Fix TerrainTemplatePreviewWidget to use proper palettes --- OpenRA.Mods.Common/Widgets/TerrainTemplatePreviewWidget.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/TerrainTemplatePreviewWidget.cs b/OpenRA.Mods.Common/Widgets/TerrainTemplatePreviewWidget.cs index ecc8a12d74..bafeb36e53 100644 --- a/OpenRA.Mods.Common/Widgets/TerrainTemplatePreviewWidget.cs +++ b/OpenRA.Mods.Common/Widgets/TerrainTemplatePreviewWidget.cs @@ -18,7 +18,6 @@ namespace OpenRA.Mods.Common.Widgets public class TerrainTemplatePreviewWidget : Widget { public Func GetScale = () => 1f; - public string Palette = TileSet.TerrainPaletteInternalName; readonly WorldRenderer worldRenderer; readonly TileSet tileset; @@ -93,7 +92,8 @@ namespace OpenRA.Mods.Common.Widgets var u = gridType == MapGridType.Rectangular ? x : (x - y) / 2f; var v = gridType == MapGridType.Rectangular ? y : (x + y) / 2f; var pos = origin + scale * (new float2(u * ts.Width, (v - 0.5f * tileInfo.Height) * ts.Height) - 0.5f * sprite.Size); - Game.Renderer.SpriteRenderer.DrawSprite(sprite, pos, worldRenderer.Palette(Palette), size); + var palette = Template.Palette ?? TileSet.TerrainPaletteInternalName; + Game.Renderer.SpriteRenderer.DrawSprite(sprite, pos, worldRenderer.Palette(palette), size); } } }