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

1
AUTHORS
View File

@@ -55,6 +55,7 @@ Also thanks to:
* Iran * Iran
* Jacob Dufault (jacobdufault) * Jacob Dufault (jacobdufault)
* James Dunne (jsd) * James Dunne (jsd)
* Jan-Willem Buurlage (jwbuurlage)
* Jason (atlimit8) * Jason (atlimit8)
* Jeff Harris (jeff_1amstudios) * Jeff Harris (jeff_1amstudios)
* Jes * Jes

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); 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)) .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(); var cursorOrder = ordersWithCursor.MaxByOrDefault(o => o.Order.OrderPriority);
return cursorName ?? (useSelect ? "select" : "default");
return cursorOrder != null ? cursorOrder.Cursor : (useSelect ? "select" : "default");
} }
static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi) static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi)

4
OpenRA.Mods.Common/Traits/Passenger.cs
View File

@@ -117,10 +117,10 @@ namespace OpenRA.Mods.Common.Traits
{ {
get get
{ {
yield return new EnterTransportTargeter("EnterTransport", 6, yield return new EnterTransportTargeter("EnterTransport", 5,
target => IsCorrectCargoType(target), target => CanEnter(target), target => IsCorrectCargoType(target), target => CanEnter(target),
Info.AlternateTransportsMode); Info.AlternateTransportsMode);
yield return new EnterTransportsTargeter("EnterTransports", 6, yield return new EnterTransportsTargeter("EnterTransports", 5,
target => IsCorrectCargoType(target), target => CanEnter(target), target => IsCorrectCargoType(target), target => CanEnter(target),
Info.AlternateTransportsMode); Info.AlternateTransportsMode);
} }