diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs index 58d1d99d93..aca75a176b 100644 --- a/OpenRA.Game/Chrome.cs +++ b/OpenRA.Game/Chrome.cs @@ -721,12 +721,14 @@ namespace OpenRA foreach (var cb in world.WorldActor.traits.WithInterface()) { + var state = cb.Enabled ? cb.Pressed ? "pressed" : "normal" : "disabled"; + var image = ChromeProvider.GetImage(renderer, cb.Image + "-button", state); + + origin.X -= (int)image.size.X + chromeButtonGap; + rgbaRenderer.DrawSprite(image, origin, "chrome"); + var button = cb; - var anim = new Animation(cb.Image); - anim.Play(cb.Enabled ? cb.Pressed ? "pressed" : "normal" : "disabled"); - origin.X -= (int)anim.Image.size.X + chromeButtonGap; - shpRenderer.DrawSprite(anim.Image, origin, "chrome"); - AddButton(new RectangleF(origin.X, origin.Y, anim.Image.size.X, anim.Image.size.Y), + AddButton(new RectangleF(origin.X, origin.Y, image.size.X, image.size.Y), _ => { if (button.Enabled) button.OnClick(); }); } diff --git a/OpenRA.Game/Traits/Chrome/PowerDownButton.cs b/OpenRA.Game/Traits/Chrome/PowerDownButton.cs index 3570978610..4c16bb6f15 100644 --- a/OpenRA.Game/Traits/Chrome/PowerDownButton.cs +++ b/OpenRA.Game/Traits/Chrome/PowerDownButton.cs @@ -8,7 +8,7 @@ namespace OpenRA.Traits class PowerDownButton : IChromeButton { - public string Image { get { return "repair"; } } // todo: art + public string Image { get { return "power"; } } public bool Enabled { get { return true; } } public bool Pressed { get { return Game.controller.orderGenerator is PowerDownOrderGenerator; } } public void OnClick() { Game.controller.ToggleInputMode(); } diff --git a/mods/ra/chrome.xml b/mods/ra/chrome.xml index 5273e1d757..a95824efe1 100644 --- a/mods/ra/chrome.xml +++ b/mods/ra/chrome.xml @@ -158,4 +158,19 @@ + + + + + + + + + + + + + + +