From 8b6308d3a29f033166e040d3a6a81943c173dbc0 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 25 Sep 2012 18:56:24 +1200 Subject: [PATCH] reduce differences between PowerBarWidget and SiloBarWidget --- OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs b/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs index 3eba0d4415..694d77fa82 100755 --- a/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs @@ -58,11 +58,7 @@ namespace OpenRA.Mods.Cnc.Widgets var providedFrac = pm.PowerProvided / powerScaleBy; lastProvidedFrac = providedFrac = float2.Lerp(lastProvidedFrac.GetValueOrDefault(providedFrac), providedFrac, .3f); - var color = Color.LimeGreen; - if (pm.PowerState == PowerState.Low) - color = Color.Orange; - if (pm.PowerState == PowerState.Critical) - color = Color.Red; + var color = GetBarColor(); var b = RenderBounds; var rect = new RectangleF(b.X, @@ -81,5 +77,12 @@ namespace OpenRA.Mods.Cnc.Widgets Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, pos); } + + Color GetBarColor() + { + if (pm.PowerState == PowerState.Critical) return Color.Red; + if (pm.PowerState == PowerState.Low) return Color.Orange; + return Color.LimeGreen; + } } }