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

Use selection priority when picking tooltip actor.

Browse Source
This commit is contained in:
Paul Chote
2013-08-11 15:56:32 +12:00
parent 0a9d920eb6
commit c3bcca2ff7
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ namespace OpenRA.Orders
{
var underCursor = world.FindUnitsAtMouse(mi.Location)
.Where(a => a.HasTrait<ITargetable>())
.OrderByDescending(a => a.SelectionPriority())
.OrderByDescending(a => a.Info.SelectionPriority())
.FirstOrDefault();
var orders = world.Selection.Actors
@@ -51,7 +51,7 @@ namespace OpenRA.Orders
var underCursor = world.FindUnitsAtMouse(mi.Location)
.Where(a => a.HasTrait<ITargetable>())
.OrderByDescending(a => a.SelectionPriority())
.OrderByDescending(a => a.Info.SelectionPriority())
.FirstOrDefault();
if (underCursor != null && (mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any()))
@@ -135,9 +135,9 @@ namespace OpenRA.Orders
public static class SelectableExts
{
public static int SelectionPriority(this Actor a)
public static int SelectionPriority(this ActorInfo a)
{
var selectableInfo = a.Info.Traits.GetOrDefault<SelectableInfo>();
var selectableInfo = a.Traits.GetOrDefault<SelectableInfo>();
return selectableInfo != null ? selectableInfo.Priority : int.MinValue;
}
}