Use Targets

This commit is contained in:
alzeih
2010-07-26 12:33:54 +12:00
parent e8adc357e9
commit 526bb3e042
11 changed files with 17 additions and 25 deletions

View File

@@ -255,8 +255,8 @@ namespace OpenRA.Mods.RA
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
if (order.TargetActor != null) line.SetTarget(self, order.TargetActor, Color.Red);
else line.SetTarget(self, order.TargetLocation, Color.Red);
if (order.TargetActor != null) line.SetTarget(self, Target.FromOrder(order), Color.Red);
else line.SetTarget(self, Target.FromOrder(order), Color.Red);
});
}
else

View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA
w.Add(new FlashTarget(order.TargetActor));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetActor, Color.Red);
line.SetTarget(self, Target.FromOrder(order), Color.Red);
});
self.CancelActivity();

View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA
w.Add(new FlashTarget(order.TargetActor));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetActor, Color.Red);
line.SetTarget(self, Target.FromOrder(order), Color.Red);
});
self.CancelActivity();

View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.RA
w.Add(new FlashTarget(order.TargetActor));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetActor, Color.Yellow);
line.SetTarget(self, Target.FromOrder(order), Color.Yellow);
});
self.CancelActivity();

View File

@@ -128,7 +128,7 @@ namespace OpenRA.Mods.RA
w.Add(new MoveFlash(self.World, order.TargetLocation));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetLocation, Color.Red);
line.SetTarget(self, Target.FromOrder(order), Color.Red);
});
self.CancelActivity();
@@ -154,7 +154,7 @@ namespace OpenRA.Mods.RA
w.Add(new FlashTarget(order.TargetActor));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetActor, Color.Green);
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.CancelActivity();

View File

@@ -80,7 +80,7 @@ namespace OpenRA.Mods.RA
w.Add(new MoveFlash(self.World, order.TargetLocation));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetLocation, Color.Green);
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.CancelActivity();
@@ -110,7 +110,7 @@ namespace OpenRA.Mods.RA
w.Add(new FlashTarget(order.TargetActor));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetActor, Color.Green);
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.CancelActivity();

View File

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA
w.Add(new FlashTarget(order.TargetActor));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetActor, Color.Green);
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.CancelActivity();

View File

@@ -96,7 +96,7 @@ namespace OpenRA.Mods.RA
w.Add(new MoveFlash(self.World, order.TargetLocation));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetLocation, Color.Green);
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.CancelActivity();
@@ -121,7 +121,7 @@ namespace OpenRA.Mods.RA
w.Add(new FlashTarget(order.TargetActor));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetActor, Color.Green);
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.CancelActivity();

View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.RA
w.Add(new FlashTarget(order.TargetActor));
var line = self.traits.GetOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, order.TargetActor, Color.Green);
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.CancelActivity();