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

Merge pull request #7445 from jwbuurlage/bleed

Browse Source 
Fixes #7219. In addition, sets cursor corresponding to the order with hi...
This commit is contained in:
Oliver Brakmann
2015-02-14 12:22:34 +01:00
parent 76bf570426 7eb2106375
commit de16d29aa6
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,12 +79,13 @@ namespace OpenRA.Orders
target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
}
var orders = world.Selection.Actors
var ordersWithCursor = world.Selection.Actors
.Select(a => OrderForUnit(a, target, mi))
.Where(o => o != null);
.Where(o => o != null && o.Cursor != null);
var cursorName = orders.Select(o => o.Cursor).FirstOrDefault();
return cursorName ?? (useSelect ? "select" : "default");
var cursorOrder = ordersWithCursor.MaxByOrDefault(o => o.Order.OrderPriority);
return cursorOrder != null ? cursorOrder.Cursor : (useSelect ? "select" : "default");
}
static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi)