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

Add missing self and optional pretick parameters to Queue, QueueChild and PrintActivity methods.

Browse Source 
This means sequenceActivities needs to accept self as well.
This commit is contained in:
tovl
2019-02-27 23:24:45 +01:00
committed by Paul Chote
parent 69004f2b94
commit 8191a6566b
32 changed files with 82 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/FindResources.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.Common.Activities
if (harv.IsFull)
{
// HACK: DeliverResources is ignored if there are queued activities, so discard NextActivity
return ActivityUtils.SequenceActivities(new DeliverResources(self));
return ActivityUtils.SequenceActivities(self, new DeliverResources(self));
}
var closestHarvestablePosition = ClosestHarvestablePos(self);
@@ -82,13 +82,13 @@ namespace OpenRA.Mods.Common.Activities
// Avoid creating an activity cycle
var next = NextInQueue;
NextInQueue = null;
return ActivityUtils.SequenceActivities(next, new Wait(randFrames), this);
return ActivityUtils.SequenceActivities(self, next, new Wait(randFrames), this);
}
else
{
// Attempt to claim the target cell
if (!claimLayer.TryClaimCell(self, closestHarvestablePosition.Value))
return ActivityUtils.SequenceActivities(new Wait(25), this);
return ActivityUtils.SequenceActivities(self, new Wait(25), this);
harv.LastSearchFailed = false;
@@ -100,7 +100,7 @@ namespace OpenRA.Mods.Common.Activities
n.MovingToResources(self, closestHarvestablePosition.Value, this);
self.SetTargetLine(Target.FromCell(self.World, closestHarvestablePosition.Value), Color.Red, false);
return ActivityUtils.SequenceActivities(mobile.MoveTo(closestHarvestablePosition.Value, 1), new HarvestResource(self), this);
return ActivityUtils.SequenceActivities(self, mobile.MoveTo(closestHarvestablePosition.Value, 1), new HarvestResource(self), this);
}
}