From fd324e2804942e422d5a1be1c9d878cc6afcaaba Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 12 May 2010 17:59:50 +1200 Subject: [PATCH] remove spurious ctor on Activities.Repair --- OpenRA.FileFormats/Exts.cs | 4 ++-- OpenRA.Game/Traits/Activities/Repair.cs | 4 ---- OpenRA.Game/Traits/Helicopter.cs | 2 +- OpenRA.Game/Traits/Plane.cs | 2 +- OpenRA.Game/Traits/Repairable.cs | 2 +- OpenRA.Mods.RA/RepairableNear.cs | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/OpenRA.FileFormats/Exts.cs b/OpenRA.FileFormats/Exts.cs index ed2a8cf1d3..da12c917c3 100644 --- a/OpenRA.FileFormats/Exts.cs +++ b/OpenRA.FileFormats/Exts.cs @@ -20,9 +20,9 @@ using System; using System.Collections.Generic; -using System.Reflection; -using System.Linq; using System.IO; +using System.Linq; +using System.Reflection; namespace OpenRA { diff --git a/OpenRA.Game/Traits/Activities/Repair.cs b/OpenRA.Game/Traits/Activities/Repair.cs index 2a543373f1..321fdacafb 100644 --- a/OpenRA.Game/Traits/Activities/Repair.cs +++ b/OpenRA.Game/Traits/Activities/Repair.cs @@ -29,8 +29,6 @@ namespace OpenRA.Traits.Activities bool isCanceled; int remainingTicks; - public Repair(bool playHostAnim) {} - public IActivity Tick(Actor self) { if (isCanceled) return NextActivity; @@ -55,8 +53,6 @@ namespace OpenRA.Traits.Activities if (self.Health == hp) return NextActivity; - - if (hostBuilding != null) hostBuilding.traits.Get() .PlayCustomAnim(hostBuilding, "active"); diff --git a/OpenRA.Game/Traits/Helicopter.cs b/OpenRA.Game/Traits/Helicopter.cs index 05ff6d5f31..f77011dc6b 100644 --- a/OpenRA.Game/Traits/Helicopter.cs +++ b/OpenRA.Game/Traits/Helicopter.cs @@ -96,7 +96,7 @@ namespace OpenRA.Traits self.QueueActivity(new Turn(self.Info.Traits.GetOrDefault().InitialFacing)); self.QueueActivity(new HeliLand(false)); self.QueueActivity(self.Info.Traits.Get().RearmBuildings.Contains(order.TargetActor.Info.Name) - ? (IActivity)new Rearm() : new Repair(true)); + ? (IActivity)new Rearm() : new Repair()); } } diff --git a/OpenRA.Game/Traits/Plane.cs b/OpenRA.Game/Traits/Plane.cs index 7662b64ac9..46b5849193 100644 --- a/OpenRA.Game/Traits/Plane.cs +++ b/OpenRA.Game/Traits/Plane.cs @@ -89,7 +89,7 @@ namespace OpenRA.Traits self.QueueActivity(new ReturnToBase(self, order.TargetActor)); self.QueueActivity( info.RearmBuildings.Contains(order.TargetActor.Info.Name) - ? (IActivity)new Rearm() : new Repair(true)); + ? (IActivity)new Rearm() : new Repair()); } } diff --git a/OpenRA.Game/Traits/Repairable.cs b/OpenRA.Game/Traits/Repairable.cs index 5689b55d01..aaaa78a18f 100644 --- a/OpenRA.Game/Traits/Repairable.cs +++ b/OpenRA.Game/Traits/Repairable.cs @@ -67,7 +67,7 @@ namespace OpenRA.Traits self.CancelActivity(); self.QueueActivity(new Move(((1 / 24f) * order.TargetActor.CenterLocation).ToInt2(), order.TargetActor)); self.QueueActivity(new Rearm()); - self.QueueActivity(new Repair(true)); + self.QueueActivity(new Repair()); } } } diff --git a/OpenRA.Mods.RA/RepairableNear.cs b/OpenRA.Mods.RA/RepairableNear.cs index 37ae04734c..497da62a14 100644 --- a/OpenRA.Mods.RA/RepairableNear.cs +++ b/OpenRA.Mods.RA/RepairableNear.cs @@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA { self.CancelActivity(); self.QueueActivity(new Move(order.TargetActor, 1)); - self.QueueActivity(new Repair(false)); + self.QueueActivity(new Repair()); } } }