From cc70669f1a1a55c8bd356f0b46974c678d8ac944 Mon Sep 17 00:00:00 2001 From: Caleb Anderson Date: Sun, 24 Oct 2010 00:11:43 -0500 Subject: [PATCH] use player color option --- OpenRA.Mods.RA/Effects/Contrail.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/OpenRA.Mods.RA/Effects/Contrail.cs b/OpenRA.Mods.RA/Effects/Contrail.cs index c8f4b2cd44..500f581c83 100755 --- a/OpenRA.Mods.RA/Effects/Contrail.cs +++ b/OpenRA.Mods.RA/Effects/Contrail.cs @@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA public readonly int[] ContrailOffset = {0, 0}; public readonly int TrailLength = 20; - public readonly int[] TrailColor = null; + public readonly bool UsePlayerColor = true; public object Create(ActorInitializer init) { return new Contrail(init.self, this); } } @@ -45,19 +45,11 @@ namespace OpenRA.Mods.RA TrailLength = Info.TrailLength; - // if no color specified or wrong format, blend with owner color - if (Info.TrailColor == null || Info.TrailColor.Length != 4) + if (Info.UsePlayerColor) { var ownerColor = Color.FromArgb(255, self.Owner.Color); TrailColor = PlayerColorRemap.ColorLerp(0.5f, ownerColor, Color.White); } - else - { - // otherwise, blend with specified color - var blendColor = Color.FromArgb(255, Info.TrailColor[1].Clamp(0, 255), - Info.TrailColor[2].Clamp(0, 255), Info.TrailColor[3].Clamp(0, 255)); - TrailColor = PlayerColorRemap.ColorLerp(0.5f, blendColor, Color.White); - } } public void Tick(Actor self)