Remove a pile of duplication from target lines.

Remove MoveFlash.

OpenRA.Game/Effects/MoveFlash.cs

@@ -1,46 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using System.Collections.Generic;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Effects
-{
-	public class MoveFlash : IEffect
-	{
-		Animation anim = new Animation("moveflsh");
-		float2 pos;
-
-		
-		public MoveFlash( World world, int2 cell )
-		{
-			this.pos = Game.CellSize * (cell + new float2(0.5f, 0.5f));
-			anim.PlayThen( "idle", 
-				() => world.AddFrameEndTask( 
-					w => w.Remove( this ) ) );
-		}
-		
-		public MoveFlash( World world, float2 pos )
-		{
-			this.pos = pos;
-			anim.PlayThen( "idle", 
-				() => world.AddFrameEndTask( 
-					w => w.Remove( this ) ) );
-		}
-
-		public void Tick( World world ) { anim.Tick(); }
-
-		public IEnumerable<Renderable> Render()
-		{
-			yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "shadow", (int)pos.Y);
-		}
-	}
-}

OpenRA.Game/OpenRA.Game.csproj

@@ -87,7 +87,6 @@
     <Compile Include="Widgets\WidgetUtils.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
     <Compile Include="Effects\FlashTarget.cs" />
-    <Compile Include="Effects\MoveFlash.cs" />
     <Compile Include="Exts.cs" />
     <Compile Include="GameRules\ActorInfo.cs" />
     <Compile Include="GameRules\VoiceInfo.cs" />

OpenRA.Game/Traits/DrawLineToTarget.cs

@@ -9,7 +9,8 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.Graphics;
+using OpenRA.Graphics;
+using OpenRA.Effects;
 
 namespace OpenRA.Traits
 {
@@ -69,6 +70,34 @@ namespace OpenRA.Traits
 				Game.Renderer.LineRenderer.DrawLine(p + new float2(1, -1), p + new float2(-1, -1), c, c);
 			}
 		}
+	}
+	
+	public static class LineTargetExts
+	{
+		public static void SetTargetLine(this Actor self, Target target, Color color)
+		{
+			self.SetTargetLine(target, color, true);
+		}
+		
+		public static void SetTargetLine(this Actor self, Target target, Color color, bool display)
+		{
+			if (self.Owner != self.World.LocalPlayer)
+				return;
+
+			self.World.AddFrameEndTask(w =>
+			{
+				if (self.Destroyed) return;
+				if (target.IsActor && display)
+					w.Add(new FlashTarget(target.Actor));
+				
+				var line = self.TraitOrDefault<DrawLineToTarget>();
+				if (line != null)
+					if (display) 
+						line.SetTarget(self, target, color);
+					else
+						line.SetTargetSilently(self, target, color);
+			});
+		}
 	}
 }