diff --git a/OpenRA.Game/Traits/Selectable.cs b/OpenRA.Game/Traits/Selectable.cs index 2a4d9f6a1f..696c7fb13f 100644 --- a/OpenRA.Game/Traits/Selectable.cs +++ b/OpenRA.Game/Traits/Selectable.cs @@ -31,19 +31,12 @@ namespace OpenRA.Traits public void RenderAfterWorld (WorldRenderer wr, Actor self) { var bounds = self.Bounds.Value; - Color selectionColor = Color.White; var xy = new float2(bounds.Left, bounds.Top); var Xy = new float2(bounds.Right, bounds.Top); var xY = new float2(bounds.Left, bounds.Bottom); - var colorResults = self.TraitsImplementing().Select(t => t.GetSelectionColorModifier(self, selectionColor)).Where( - c => c.ToArgb() != selectionColor.ToArgb()); - - if (colorResults.Any()) - selectionColor = colorResults.First(); - - wr.DrawSelectionBox(self, selectionColor); + wr.DrawSelectionBox(self, Color.White); DrawHealthBar(self, xy, Xy); DrawControlGroup(wr, self, xy); DrawPips(wr, self, xY); diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index b2030602bd..e4bac039a0 100755 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -115,7 +115,6 @@ namespace OpenRA.Traits public interface IDamageModifier { float GetDamageModifier(Actor attacker, WarheadInfo warhead); } public interface ISpeedModifier { decimal GetSpeedModifier(); } public interface IFirepowerModifier { float GetFirepowerModifier(); } - public interface ISelectionColorModifier { Color GetSelectionColorModifier(Actor self, Color defaultColor); } public interface IPalette { void InitPalette(WorldRenderer wr); } public interface IPaletteModifier { void AdjustPalette(Dictionary b); } public interface IPips { IEnumerable GetPips(Actor self); }