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

Cache IMove in Repairable's ctor

Browse Source 
Instead of looking it up on every repair order.
This commit is contained in:
reaperrr
2016-04-24 18:51:26 +02:00
parent 23e5889a70
commit b497869993
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Repairable.cs
View File

@@ -20,7 +20,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("This actor can be sent to a structure for repairs.")] [Desc("This actor can be sent to a structure for repairs.")]
class RepairableInfo : ITraitInfo, Requires<HealthInfo> class RepairableInfo : ITraitInfo, Requires<HealthInfo>, Requires<IMoveInfo>
{ {
public readonly HashSet<string> RepairBuildings = new HashSet<string> { "fix" }; public readonly HashSet<string> RepairBuildings = new HashSet<string> { "fix" };
@@ -33,12 +33,14 @@ namespace OpenRA.Mods.Common.Traits
{ {
readonly RepairableInfo info; readonly RepairableInfo info;
readonly Health health; readonly Health health;
readonly IMove movement;
readonly AmmoPool[] ammoPools; readonly AmmoPool[] ammoPools;
public Repairable(Actor self, RepairableInfo info) public Repairable(Actor self, RepairableInfo info)
{ {
this.info = info; this.info = info;
health = self.Trait<Health>(); health = self.Trait<Health>();
movement = self.Trait<IMove>();
ammoPools = self.TraitsImplementing<AmmoPool>().ToArray(); ammoPools = self.TraitsImplementing<AmmoPool>().ToArray();
} }
@@ -90,7 +92,6 @@ namespace OpenRA.Mods.Common.Traits
if (!CanRepairAt(order.TargetActor) || (!CanRepair() && !CanRearm())) if (!CanRepairAt(order.TargetActor) || (!CanRepair() && !CanRearm()))
return; return;
var movement = self.Trait<IMove>();
var target = Target.FromOrder(self.World, order); var target = Target.FromOrder(self.World, order);
self.SetTargetLine(target, Color.Green); self.SetTargetLine(target, Color.Green);