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

Fix InputOverridesSelection only considering the closest actor.

Browse Source
This commit is contained in:
Paul Chote
2019-10-29 19:22:10 +00:00
committed by abcdefg30
parent 230a0b330c
commit 0cfd6337ff
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,22 +102,19 @@ namespace OpenRA.Orders
var target = Target.FromActor(actor); var target = Target.FromActor(actor);
var cell = world.Map.CellContaining(target.CenterPosition); var cell = world.Map.CellContaining(target.CenterPosition);
var actorsAt = world.ActorMap.GetActorsAt(cell).ToList(); var actorsAt = world.ActorMap.GetActorsAt(cell).ToList();
var underCursor = world.Selection.Actors
.Select(a => new ActorBoundsPair(a, a.MouseBounds(wr)))
.WithHighestSelectionPriority(xy, mi.Modifiers);
var o = OrderForUnit(underCursor, target, actorsAt, cell, mi); var modifiers = TargetModifiers.None;
if (o != null) if (mi.Modifiers.HasModifier(Modifiers.Ctrl))
modifiers |= TargetModifiers.ForceAttack;
if (mi.Modifiers.HasModifier(Modifiers.Shift))
modifiers |= TargetModifiers.ForceQueue;
if (mi.Modifiers.HasModifier(Modifiers.Alt))
modifiers |= TargetModifiers.ForceMove;
foreach (var a in world.Selection.Actors)
{ {
var modifiers = TargetModifiers.None; var o = OrderForUnit(a, target, actorsAt, cell, mi);
if (mi.Modifiers.HasModifier(Modifiers.Ctrl)) if (o != null && o.Order.TargetOverridesSelection(modifiers))
modifiers |= TargetModifiers.ForceAttack;
if (mi.Modifiers.HasModifier(Modifiers.Shift))
modifiers |= TargetModifiers.ForceQueue;
if (mi.Modifiers.HasModifier(Modifiers.Alt))
modifiers |= TargetModifiers.ForceMove;
if (o.Order.TargetOverridesSelection(modifiers))
return true; return true;
} }