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);
+			});
+		}
 	}
 }
 

OpenRA.Mods.Cnc/TiberiumRefineryDockAction.cs

@@ -56,14 +56,7 @@ namespace OpenRA.Mods.Cnc
 					if (harvester.LastHarvestedCell != int2.Zero)
 					{
 						harv.QueueActivity( mobile.MoveTo(harvester.LastHarvestedCell, 5) );
-						if (harv.Owner == self.World.LocalPlayer)
+						harv.SetTargetLine(Target.FromCell(harvester.LastHarvestedCell), Color.Red, false);
-							self.World.AddFrameEndTask( w =>
-							{
-								if (harv.Destroyed) return;
-								var line = harv.TraitOrDefault<DrawLineToTarget>();
-								if (line != null)
-									line.SetTargetSilently(harv, Target.FromCell(harvester.LastHarvestedCell), Color.Green);                           
-							});
 					}
 				}
 				harv.QueueActivity( new Harvest() );	

OpenRA.Mods.RA/Activities/UnloadCargo.cs

@@ -73,12 +73,7 @@ namespace OpenRA.Mods.RA.Activities
 				mobile.SetPosition(actor, self.Location);
 				actor.CancelActivity();
 				actor.QueueActivity(mobile.MoveTo(exitTile.Value, 0));
-				if (actor.Owner == self.World.LocalPlayer)
+				actor.SetTargetLine(Target.FromCell(exitTile.Value), Color.Green, false);
-				{
-					var line = actor.TraitOrDefault<DrawLineToTarget>();
-					if (line != null)
-						line.SetTargetSilently(self, Target.FromCell(exitTile.Value), Color.Green);
-				}
 			});
 
 			return this;

OpenRA.Mods.RA/Air/Helicopter.cs

@@ -78,17 +78,8 @@ namespace OpenRA.Mods.RA.Air
 			if (order.OrderString == "Move")
 			{
 				var target = order.TargetLocation.Clamp(self.World.Map.Bounds);
-
-				if (self.Owner == self.World.LocalPlayer)
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						w.Add(new MoveFlash(self.World, order.TargetLocation));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromCell(target), Color.Green);
-					});
 				
+				self.SetTargetLine(Target.FromCell(target), Color.Green);
 				self.CancelActivity();
 				self.QueueActivity(new HeliFly(Util.CenterOfCell(target)));
 					
@@ -109,15 +100,7 @@ namespace OpenRA.Mods.RA.Air
 				var exit = order.TargetActor.Info.Traits.WithInterface<ExitInfo>().FirstOrDefault();
 				var offset = exit != null ? exit.SpawnOffset : int2.Zero;
 				
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromActor(order.TargetActor), Color.Green);
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						w.Add(new FlashTarget(order.TargetActor));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromActor(order.TargetActor), Color.Green);
-					});
 				
 				self.CancelActivity();
 				self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset));

OpenRA.Mods.RA/Air/Plane.cs

@@ -92,16 +92,7 @@ namespace OpenRA.Mods.RA.Air
 				UnReserve();
 				
 				var target = order.TargetLocation.Clamp(self.World.Map.Bounds);
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromCell(target), Color.Green);
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						w.Add(new MoveFlash(self.World, order.TargetLocation));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromCell(target), Color.Green);
-					});
-
 				self.CancelActivity();
 				self.QueueActivity(Fly.ToCell(target));
 			}
@@ -113,16 +104,7 @@ namespace OpenRA.Mods.RA.Air
 				UnReserve();
 
 				var info = self.Info.Traits.Get<PlaneInfo>();
-
+				self.SetTargetLine(Target.FromOrder(order), Color.Green);
-				if (self.Owner == self.World.LocalPlayer)
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						w.Add(new FlashTarget(order.TargetActor));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromActor(order.TargetActor), Color.Green);
-					});
 
 				self.CancelActivity();
 				self.QueueActivity(new ReturnToBase(self, order.TargetActor));

OpenRA.Mods.RA/AttackBase.cs

@@ -177,18 +177,7 @@ namespace OpenRA.Mods.RA
 		{
 			if( !target.IsValid ) return;
 			self.QueueActivity(queued, GetAttackActivity(self, target, allowMove));
-
+			self.SetTargetLine(target, Color.Red);
-			if (self.Owner == self.World.LocalPlayer)
-				self.World.AddFrameEndTask(w =>
-				{
-					if (self.Destroyed) return;
-					if (target.IsActor)
-						w.Add(new FlashTarget(target.Actor));
-
-					var line = self.TraitOrDefault<DrawLineToTarget>();
-					if (line != null)
-						line.SetTarget(self, target, Color.Red);
-				});
 		}
 
 		public void ScanAndAttack(Actor self, bool allowMovement, bool holdStill)

OpenRA.Mods.RA/AttackMove.cs

@@ -52,19 +52,8 @@ namespace OpenRA.Mods.RA
 					AttackMoving = true;
 					TargetLocation = order.TargetLocation;
 				}
-
+				
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Red);
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						if (order.TargetActor != null)
-							w.Add(new FlashTarget(order.TargetActor));
-
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							if (order.TargetActor != null) line.SetTarget(self, Target.FromOrder(order), Color.Red);
-							else line.SetTarget(self, Target.FromOrder(order), Color.Red);
-					});
 			}
 			else
 			{

OpenRA.Mods.RA/C4Demolition.cs

@@ -43,15 +43,7 @@ namespace OpenRA.Mods.RA
 		{
 			if (order.OrderString == "C4")
 			{
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Red);
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						w.Add(new FlashTarget(order.TargetActor));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromOrder(order), Color.Red);
-					});
 				
 				var mobile = self.Trait<Mobile>();
 				self.CancelActivity();

OpenRA.Mods.RA/ChronoshiftDeploy.cs

@@ -55,7 +55,6 @@ namespace OpenRA.Mods.RA
 				if (self.Owner == self.World.LocalPlayer)
 				{
 					self.World.CancelInputMode();
-					self.World.AddFrameEndTask(w => w.Add(new MoveFlash(self.World, order.TargetLocation)));
 				}
 				
 				self.CancelActivity();

OpenRA.Mods.RA/EngineerCapture.cs

@@ -47,16 +47,8 @@ namespace OpenRA.Mods.RA
 		{
 			if (order.OrderString == "CaptureBuilding")
 			{
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Red);
-					self.World.AddFrameEndTask(w =>
+								
-					{
-						if (self.Destroyed) return;
-						w.Add(new FlashTarget(order.TargetActor));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromOrder(order), Color.Red);
-					});
-				
 				self.CancelActivity();
 				self.QueueActivity(new Enter(order.TargetActor));
 				//self.QueueActivity(new Move(order.TargetActor.Location, order.TargetActor));

OpenRA.Mods.RA/EngineerRepair.cs

@@ -46,16 +46,8 @@ namespace OpenRA.Mods.RA
 			if (order.OrderString == "EngineerRepair"
 			    && order.TargetActor.GetDamageState() > DamageState.Undamaged)
 			{
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Yellow);
-					self.World.AddFrameEndTask(w =>
+								
-					{
-						if (self.Destroyed) return;
-						w.Add(new FlashTarget(order.TargetActor));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromOrder(order), Color.Yellow);
-					});
-				
 				self.CancelActivity();
 				self.QueueActivity(new Enter(order.TargetActor));
 				//self.QueueActivity(new Move(order.TargetActor.Location, order.TargetActor));

OpenRA.Mods.RA/Harvester.cs

@@ -123,15 +123,7 @@ namespace OpenRA.Mods.RA
 		{
 			if (order.OrderString == "Harvest")
 			{
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Red);
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						w.Add(new MoveFlash(self.World, order.TargetLocation));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromOrder(order), Color.Red);
-					});
 				
 				var mobile = self.Trait<Mobile>();
 				self.CancelActivity();
@@ -151,16 +143,8 @@ namespace OpenRA.Mods.RA
 				if (IsEmpty)
 					return;
 				
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Green);
-					self.World.AddFrameEndTask(w =>
+
-					{
-						if (self.Destroyed) return;
-						w.Add(new FlashTarget(order.TargetActor));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromOrder(order), Color.Green);
-					});
-				
 				self.CancelActivity();
 				self.QueueActivity(new DeliverResources());
 			}

OpenRA.Mods.RA/Move/Mobile.cs

@@ -192,17 +192,7 @@ namespace OpenRA.Mods.RA.Move
 
 					qa.Insert(new Move(currentLocation, 8));
 					
-					if (self.Owner == self.World.LocalPlayer)
+					self.SetTargetLine(Target.FromCell(currentLocation), Color.Green);
-						self.World.AddFrameEndTask(
-							w =>
-							{
-								if (self.Destroyed) return;
-								w.Add(new MoveFlash(self.World, targetLocation));
-								var line = self.TraitOrDefault<DrawLineToTarget>();
-								if (line != null)
-									line.SetTarget(self, Target.FromCell(currentLocation),
-									               Color.Green);
-							});
 				});
 
 			self.QueueActivity(queued ? ph : ph.Run(self));
@@ -352,14 +342,7 @@ namespace OpenRA.Mods.RA.Move
 			if (moveTo.HasValue)
 			{
 				self.CancelActivity();
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromCell(moveTo.Value), Color.Green, false);
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTargetSilently(self, Target.FromCell(moveTo.Value), Color.Green);
-					});
 				self.QueueActivity(new Move(moveTo.Value, 0));
 
 				Log.Write("debug", "OnNudge #{0} from {1} to {2}",

OpenRA.Mods.RA/OreRefineryDockAction.cs

@@ -44,14 +44,7 @@ namespace OpenRA.Mods.RA
 						{
 							var mobile = harv.Trait<Mobile>();
 							harv.QueueActivity( mobile.MoveTo(harvester.LastHarvestedCell, 5) );
-							if (harv.Owner == self.World.LocalPlayer)
+							harv.SetTargetLine(Target.FromCell(harvester.LastHarvestedCell), Color.Red, false);
-								self.World.AddFrameEndTask( w =>
-								{
-									if (harv.Destroyed) return;
-									var line = harv.TraitOrDefault<DrawLineToTarget>();
-									if (line != null)
-										line.SetTargetSilently(harv, Target.FromCell(harvester.LastHarvestedCell), Color.Green);
-								});
 						}
 						harv.QueueActivity( new Harvest() );
 					});

OpenRA.Mods.RA/Passenger.cs

@@ -78,16 +78,8 @@ namespace OpenRA.Mods.RA
 				if (!CanEnter(order.TargetActor)) return;
 				if (!IsCorrectCargoType(order.TargetActor)) return;
 				
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Green);
-					self.World.AddFrameEndTask(w =>
+								
-					{
-						if (self.Destroyed) return;
-						w.Add(new FlashTarget(order.TargetActor));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromOrder(order), Color.Green);
-					});
-				
 				var mobile = self.Trait<Mobile>();
 				self.CancelActivity();
 				self.QueueActivity(mobile.MoveTo(order.TargetActor.Location, 1));

OpenRA.Mods.RA/Production.cs

@@ -76,16 +76,7 @@ namespace OpenRA.Mods.RA
 				newUnit.QueueActivity(mobile.MoveTo(target, 1));
 			}
 			
-			if (newUnit.Owner == self.World.LocalPlayer)
+			newUnit.SetTargetLine(Target.FromCell(target), Color.Green, false);
-			{
-				self.World.AddFrameEndTask(w =>
-				{
-					var line = newUnit.TraitOrDefault<DrawLineToTarget>();
-					if (line != null)
-						line.SetTargetSilently(newUnit, Target.FromCell(target), Color.Green);
-				});
-			}
-
 			foreach (var t in self.TraitsImplementing<INotifyProduction>())
 				t.UnitProduced(self, newUnit, exit);
 

OpenRA.Mods.RA/Repairable.cs

@@ -75,25 +75,19 @@ namespace OpenRA.Mods.RA
 				
 				var mobile = self.Trait<Mobile>();
 				var rp = order.TargetActor.TraitOrDefault<RallyPoint>();
-
+				self.SetTargetLine(Target.FromOrder(order), Color.Green);
-				if (self.Owner == self.World.LocalPlayer)
+								
-					self.World.AddFrameEndTask(w =>
-					{
-						if (self.Destroyed) return;
-						w.Add(new FlashTarget(order.TargetActor));
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTarget(self, Target.FromOrder(order), Color.Green);
-					});
-				
 				self.CancelActivity();
 				self.QueueActivity(mobile.MoveTo(Traits.Util.CellContaining(order.TargetActor.CenterLocation), order.TargetActor));
 				self.QueueActivity(new Rearm());
 				self.QueueActivity(new Repair(order.TargetActor));
 
 				if (rp != null)
-					self.QueueActivity(new CallFunc(
+					self.QueueActivity(new CallFunc(() => 
-						() => self.QueueActivity(mobile.MoveTo(rp.rallyPoint, order.TargetActor))));
+					{
+						self.SetTargetLine(Target.FromCell(rp.rallyPoint), Color.Green);
+						self.QueueActivity(mobile.MoveTo(rp.rallyPoint, order.TargetActor));
+					}));
 			}
 		}
 	}

OpenRA.Mods.RA/RepairableNear.cs

@@ -67,14 +67,7 @@ namespace OpenRA.Mods.RA
 				var mobile = self.Trait<Mobile>();
 				self.CancelActivity();
 				self.QueueActivity(mobile.MoveWithinRange(order.TargetActor, 1));
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Green, false);
-					self.World.AddFrameEndTask( w =>
-					{
-						if (self.Destroyed) return;
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTargetSilently(self, Target.FromActor(order.TargetActor), Color.Green);
-					});
 				self.QueueActivity(new Repair(order.TargetActor));
 			}
 		}

OpenRA.Mods.RA/Spy.cs

@@ -40,14 +40,7 @@ namespace OpenRA.Mods.RA
 			{
 				self.CancelActivity();
 				self.QueueActivity(new MoveAdjacentTo(order.TargetActor));
-				if (self.Owner == self.World.LocalPlayer)
+				self.SetTargetLine(Target.FromOrder(order), Color.Red);
-					self.World.AddFrameEndTask( w =>
-					{
-						if (self.Destroyed) return;
-						var line = self.TraitOrDefault<DrawLineToTarget>();
-						if (line != null)
-							line.SetTargetSilently(self, Target.FromActor(order.TargetActor), Color.Green);
-					});
 				self.QueueActivity(new Infiltrate(order.TargetActor));
 			}
 		}