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

Pass contextual information to TargetOverridesSelection.

Browse Source
This commit is contained in:
Paul Chote
2019-10-29 19:29:43 +00:00
committed by abcdefg30
parent 3d6621f7ff
commit 0e4cb53ada
14 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -120,7 +120,7 @@ namespace OpenRA.Orders
foreach (var a in world.Selection.Actors)
{
var o = OrderForUnit(a, target, actorsAt, cell, mi);
if (o != null && o.Order.TargetOverridesSelection(modifiers))
if (o != null && o.Order.TargetOverridesSelection(a, target, actorsAt, cell, modifiers))
return true;
}

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -183,7 +183,7 @@ namespace OpenRA.Traits
int OrderPriority { get; }
bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, ref TargetModifiers modifiers, ref string cursor);
bool IsQueued { get; }
bool TargetOverridesSelection(TargetModifiers modifiers);
bool TargetOverridesSelection(Actor self, Target target, List<Actor> actorsAt, CPos xy, TargetModifiers modifiers);
}
public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }