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

6
OpenRA.Mods.Common/Activities/DeliverUnit.cs
View File

@@ -98,7 +98,7 @@ namespace OpenRA.Mods.Common.Activities
// Can't land, so wait at the target until something changes
if (!targetLocation.HasValue)
{
innerActivity = ActivityUtils.SequenceActivities(
innerActivity = ActivityUtils.SequenceActivities(self,
new HeliFly(self, Target.FromCell(self.World, destination)),
new Wait(25));
@@ -117,7 +117,7 @@ namespace OpenRA.Mods.Common.Activities
{
var facing = (targetPosition - self.CenterPosition).Yaw.Facing;
localOffset = carryall.CarryableOffset.Rotate(body.QuantizeOrientation(self, WRot.FromFacing(facing)));
innerActivity = ActivityUtils.SequenceActivities(
innerActivity = ActivityUtils.SequenceActivities(self,
new HeliFly(self, Target.FromPos(targetPosition - body.LocalToWorld(localOffset))),
new Turn(self, facing));
@@ -170,7 +170,7 @@ namespace OpenRA.Mods.Common.Activities
return this;
case DeliveryState.TakeOff:
return ActivityUtils.SequenceActivities(new HeliFly(self, Target.FromPos(self.CenterPosition)), NextActivity);
return ActivityUtils.SequenceActivities(self, new HeliFly(self, Target.FromPos(self.CenterPosition)), NextActivity);
case DeliveryState.Aborted:
carryall.UnreserveCarryable(self);