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

9
OpenRA.Mods.Common/Activities/Attack.cs
View File

@@ -114,7 +114,7 @@ namespace OpenRA.Mods.Common.Activities
// Move towards the last known position
wasMovingWithinRange = true;
return ActivityUtils.SequenceActivities(
return ActivityUtils.SequenceActivities(self,
move.MoveWithinRange(target, WDist.Zero, lastVisibleMaximumRange, checkTarget.CenterPosition, Color.Red),
this);
}
@@ -168,7 +168,7 @@ namespace OpenRA.Mods.Common.Activities
var sightRange = rs != null ? rs.Range : WDist.FromCells(2);
attackStatus |= AttackStatus.NeedsToMove;
moveActivity = ActivityUtils.SequenceActivities(
moveActivity = ActivityUtils.SequenceActivities(self,
move.MoveWithinRange(target, sightRange, target.CenterPosition, Color.Red),
this);
@@ -195,9 +195,8 @@ namespace OpenRA.Mods.Common.Activities
return AttackStatus.UnableToAttack;
attackStatus |= AttackStatus.NeedsToMove;
var checkTarget = useLastVisibleTarget ? lastVisibleTarget : target;
moveActivity = ActivityUtils.SequenceActivities(
moveActivity = ActivityUtils.SequenceActivities(self,
move.MoveWithinRange(target, minRange, maxRange, checkTarget.CenterPosition, Color.Red),
this);
@@ -209,7 +208,7 @@ namespace OpenRA.Mods.Common.Activities
if (!Util.FacingWithinTolerance(facing.Facing, desiredFacing, ((AttackFrontalInfo)attack.Info).FacingTolerance))
{
attackStatus |= AttackStatus.NeedsToTurn;
turnActivity = ActivityUtils.SequenceActivities(new Turn(self, desiredFacing), this);
turnActivity = ActivityUtils.SequenceActivities(self, new Turn(self, desiredFacing), this);
return AttackStatus.NeedsToTurn;
}