epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove spurious ctor on Activities.Repair

Browse Source
This commit is contained in:
Chris Forbes
2010-05-12 17:59:50 +12:00
parent fb592b90d5
commit fd324e2804
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.FileFormats/Exts.cs
View File

@@ -20,9 +20,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection;
using System.Linq;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection;
namespace OpenRA namespace OpenRA
{ {

4
OpenRA.Game/Traits/Activities/Repair.cs
View File

@@ -29,8 +29,6 @@ namespace OpenRA.Traits.Activities
bool isCanceled; bool isCanceled;
int remainingTicks; int remainingTicks;
public Repair(bool playHostAnim) {}
public IActivity Tick(Actor self) public IActivity Tick(Actor self)
{ {
if (isCanceled) return NextActivity; if (isCanceled) return NextActivity;
@@ -55,8 +53,6 @@ namespace OpenRA.Traits.Activities
if (self.Health == hp) if (self.Health == hp)
return NextActivity; return NextActivity;
if (hostBuilding != null) if (hostBuilding != null)
hostBuilding.traits.Get<RenderBuilding>() hostBuilding.traits.Get<RenderBuilding>()
.PlayCustomAnim(hostBuilding, "active"); .PlayCustomAnim(hostBuilding, "active");

2
OpenRA.Game/Traits/Helicopter.cs
View File

@@ -96,7 +96,7 @@ namespace OpenRA.Traits
self.QueueActivity(new Turn(self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing)); self.QueueActivity(new Turn(self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing));
self.QueueActivity(new HeliLand(false)); self.QueueActivity(new HeliLand(false));
self.QueueActivity(self.Info.Traits.Get<HelicopterInfo>().RearmBuildings.Contains(order.TargetActor.Info.Name) self.QueueActivity(self.Info.Traits.Get<HelicopterInfo>().RearmBuildings.Contains(order.TargetActor.Info.Name)
? (IActivity)new Rearm() : new Repair(true)); ? (IActivity)new Rearm() : new Repair());
} }
} }

2
OpenRA.Game/Traits/Plane.cs
View File

@@ -89,7 +89,7 @@ namespace OpenRA.Traits
self.QueueActivity(new ReturnToBase(self, order.TargetActor)); self.QueueActivity(new ReturnToBase(self, order.TargetActor));
self.QueueActivity( self.QueueActivity(
info.RearmBuildings.Contains(order.TargetActor.Info.Name) info.RearmBuildings.Contains(order.TargetActor.Info.Name)
? (IActivity)new Rearm() : new Repair(true)); ? (IActivity)new Rearm() : new Repair());
} }
} }

2
OpenRA.Game/Traits/Repairable.cs
View File

@@ -67,7 +67,7 @@ namespace OpenRA.Traits
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Move(((1 / 24f) * order.TargetActor.CenterLocation).ToInt2(), order.TargetActor)); self.QueueActivity(new Move(((1 / 24f) * order.TargetActor.CenterLocation).ToInt2(), order.TargetActor));
self.QueueActivity(new Rearm()); self.QueueActivity(new Rearm());
self.QueueActivity(new Repair(true)); self.QueueActivity(new Repair());
} }
} }
} }

2
OpenRA.Mods.RA/RepairableNear.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA
{ {
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Move(order.TargetActor, 1)); self.QueueActivity(new Move(order.TargetActor, 1));
self.QueueActivity(new Repair(false)); self.QueueActivity(new Repair());
} }
} }
} }