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

Pass target line color to inner move activities.

Browse Source
This commit is contained in:
Paul Chote
2019-01-13 16:36:30 +00:00
parent 62102b9f77
commit b2d960ec19
32 changed files with 127 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/ActorExts.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common
/// <summary>
/// DEPRECATED: Write code that can handle FrozenActors correctly instead.
/// </summary>
public static Target ResolveFrozenActorOrder(this Actor self, Order order, Color targetLine)
public static Target ResolveFrozenActorOrder(this Actor self, Order order, Color targetLineColor)
{
// Not targeting a frozen actor
if (order.Target.Type != TargetType.FrozenActor)
@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common
var frozen = order.Target.FrozenActor;
self.SetTargetLine(order.Target, targetLine, true);
self.SetTargetLine(order.Target, targetLineColor, true);
// Target is still alive - resolve the real order
if (frozen.Actor != null && frozen.Actor.IsInWorld)
@@ -89,7 +89,8 @@ namespace OpenRA.Mods.Common
.Append(WDist.FromCells(2))
.Max();
self.QueueActivity(move.MoveWithinRange(Target.FromPos(frozen.CenterPosition), range));
self.QueueActivity(move.MoveWithinRange(Target.FromPos(frozen.CenterPosition), range,
targetLineColor: targetLineColor));
}
return Target.Invalid;