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/Traits/Air/Aircraft.cs
View File

@@ -657,7 +657,7 @@ namespace OpenRA.Mods.Common.Traits
return new Fly(self, target, WDist.FromCells(3), WDist.FromCells(5),
initialTargetPosition, targetLineColor);
return ActivityUtils.SequenceActivities(
return ActivityUtils.SequenceActivities(self,
new HeliFly(self, target, initialTargetPosition, targetLineColor),
new Turn(self, Info.InitialFacing));
}
@@ -674,11 +674,11 @@ namespace OpenRA.Mods.Common.Traits
{
// TODO: Ignore repulsion when moving
if (!Info.CanHover)
return ActivityUtils.SequenceActivities(
return ActivityUtils.SequenceActivities(self,
new CallFunc(() => SetVisualPosition(self, fromPos)),
new Fly(self, Target.FromPos(toPos)));
return ActivityUtils.SequenceActivities(
return ActivityUtils.SequenceActivities(self,
new CallFunc(() => SetVisualPosition(self, fromPos)),
new HeliFly(self, Target.FromPos(toPos)));
}

2
OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -275,7 +275,7 @@ namespace OpenRA.Mods.Common.Traits
}
wasMovingWithinRange = true;
return ActivityUtils.SequenceActivities(
return ActivityUtils.SequenceActivities(self,
move.MoveWithinRange(target, minRange, maxRange, checkTarget.CenterPosition, Color.Red),
this);
}

8
OpenRA.Mods.Common/Traits/Buildings/Refinery.cs
View File

@@ -144,12 +144,12 @@ namespace OpenRA.Mods.Common.Traits
{
if (!preventDock)
{
dockOrder.Queue(new CallFunc(() => dockedHarv = harv, false));
dockOrder.Queue(DockSequence(harv, self));
dockOrder.Queue(new CallFunc(() => dockedHarv = null, false));
dockOrder.Queue(self, new CallFunc(() => dockedHarv = harv, false));
dockOrder.Queue(self, DockSequence(harv, self));
dockOrder.Queue(self, new CallFunc(() => dockedHarv = null, false));
}
dockOrder.Queue(new CallFunc(() => harv.Trait<Harvester>().ContinueHarvesting(harv)));
dockOrder.Queue(self, new CallFunc(() => harv.Trait<Harvester>().ContinueHarvesting(harv)));
}
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)

4
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -271,7 +271,7 @@ namespace OpenRA.Mods.Common.Traits
var notifyBlocking = new CallFunc(() => self.NotifyBlocker(cellInfo.Cell));
var waitFor = new WaitFor(() => CanEnterCell(cellInfo.Cell));
var move = new Move(self, cellInfo.Cell);
self.QueueActivity(ActivityUtils.SequenceActivities(notifyBlocking, waitFor, move));
self.QueueActivity(ActivityUtils.SequenceActivities(self, notifyBlocking, waitFor, move));
Log.Write("debug", "OnNudge (notify next blocking actor, wait and move) #{0} from {1} to {2}",
self.ActorID, self.Location, cellInfo.Cell);
@@ -628,7 +628,7 @@ namespace OpenRA.Mods.Common.Traits
var delta = toPos - fromPos;
var facing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : Facing;
return ActivityUtils.SequenceActivities(new Turn(self, facing), new Drag(self, fromPos, toPos, length));
return ActivityUtils.SequenceActivities(self, new Turn(self, facing), new Drag(self, fromPos, toPos, length));
}
CPos? ClosestGroundCell()

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

@@ -112,13 +112,11 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity();
self.SetTargetLine(order.Target, Color.Green);
var activities = ActivityUtils.SequenceActivities(
var activities = ActivityUtils.SequenceActivities(self,
movement.MoveToTarget(self, order.Target, targetLineColor: Color.Green),
new CallFunc(() => AfterReachActivities(self, order, movement)));
self.QueueActivity(new WaitForTransport(self, activities));
TryCallTransport(self, order.Target, new CallFunc(() => AfterReachActivities(self, order, movement)));
}
}