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

Cache INotifyHarvesterAction trait look-ups

Browse Source
This commit is contained in:
reaperrr
2017-07-20 14:43:55 +02:00
committed by Paul Chote
parent bac8d3233a
commit 406f482a19
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Traits/Harvester.cs
View File

@@ -78,13 +78,14 @@ namespace OpenRA.Mods.Common.Traits
public class Harvester : IIssueOrder, IResolveOrder, IPips, public class Harvester : IIssueOrder, IResolveOrder, IPips,
IExplodeModifier, IOrderVoice, ISpeedModifier, ISync, INotifyCreated, IExplodeModifier, IOrderVoice, ISpeedModifier, ISync, INotifyCreated,
INotifyIdle, INotifyBlockingMove, INotifyBuildComplete INotifyIdle, INotifyBlockingMove
{ {
public readonly HarvesterInfo Info; public readonly HarvesterInfo Info;
readonly Mobile mobile; readonly Mobile mobile;
readonly ResourceLayer resLayer; readonly ResourceLayer resLayer;
readonly ResourceClaimLayer claimLayer; readonly ResourceClaimLayer claimLayer;
Dictionary<ResourceTypeInfo, int> contents = new Dictionary<ResourceTypeInfo, int>(); Dictionary<ResourceTypeInfo, int> contents = new Dictionary<ResourceTypeInfo, int>();
INotifyHarvesterAction[] notify;
bool idleSmart = true; bool idleSmart = true;
int idleDuration; int idleDuration;
@@ -118,14 +119,11 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
if (Info.SearchOnCreation) notify = self.TraitsImplementing<INotifyHarvesterAction>().ToArray();
self.QueueActivity(new FindResources(self));
}
void INotifyBuildComplete.BuildingComplete(Actor self) // Note: This is queued in a FrameEndTask because otherwise the activity is dropped/overridden while moving out of a factory.
{
if (Info.SearchOnCreation) if (Info.SearchOnCreation)
self.QueueActivity(new FindResources(self)); self.World.AddFrameEndTask(w => self.QueueActivity(new FindResources(self)));
} }
public void SetProcLines(Actor proc) public void SetProcLines(Actor proc)
@@ -389,7 +387,6 @@ namespace OpenRA.Mods.Common.Traits
self.QueueActivity(findResources); self.QueueActivity(findResources);
self.SetTargetLine(Target.FromCell(self.World, loc.Value), Color.Red); self.SetTargetLine(Target.FromCell(self.World, loc.Value), Color.Red);
var notify = self.TraitsImplementing<INotifyHarvesterAction>();
foreach (var n in notify) foreach (var n in notify)
n.MovingToResources(self, loc.Value, findResources); n.MovingToResources(self, loc.Value, findResources);
@@ -417,13 +414,11 @@ namespace OpenRA.Mods.Common.Traits
var deliver = new DeliverResources(self); var deliver = new DeliverResources(self);
self.QueueActivity(deliver); self.QueueActivity(deliver);
var notify = self.TraitsImplementing<INotifyHarvesterAction>();
foreach (var n in notify) foreach (var n in notify)
n.MovingToRefinery(self, order.TargetLocation, deliver); n.MovingToRefinery(self, order.TargetLocation, deliver);
} }
else if (order.OrderString == "Stop" || order.OrderString == "Move") else if (order.OrderString == "Stop" || order.OrderString == "Move")
{ {
var notify = self.TraitsImplementing<INotifyHarvesterAction>();
foreach (var n in notify) foreach (var n in notify)
n.MovementCancelled(self); n.MovementCancelled(self);