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

ChooseCursor sanity

Browse Source
This commit is contained in:
Chris Forbes
2009-12-02 19:22:15 +13:00
parent fb7f1f2817
commit 074ab5675e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRa.Game/Controller.cs
View File

@@ -47,10 +47,6 @@ namespace OpenRa.Game
recentOrders.RemoveAll(o => !o.IsImmediate); recentOrders.RemoveAll(o => !o.IsImmediate);
return result; return result;
} }
//var ret = recentOrders;
//recentOrders = new List<Order>();
//return ret;
} }
static string GetVoiceSuffix(Actor unit) static string GetVoiceSuffix(Actor unit)
@@ -120,7 +116,8 @@ namespace OpenRa.Game
public Cursor ChooseCursor() public Cursor ChooseCursor()
{ {
var c = (orderGenerator is UnitOrderGenerator) ? orderGenerator.Order(dragEnd.ToInt2(), false) var c = (orderGenerator is UnitOrderGenerator) ? orderGenerator.Order(dragEnd.ToInt2(), false)
.Select(a => CursorForOrderString( a.OrderString, a.Subject, a.TargetLocation )) .Where( o => o.Validate() )
.Select(o => CursorForOrderString( o.OrderString, o.Subject, o.TargetLocation ))
.FirstOrDefault(a => a != null) : null; .FirstOrDefault(a => a != null) : null;
return c ?? (Game.SelectActorsInBox(Game.CellSize * dragEnd, Game.CellSize * dragEnd).Any() ? Cursor.Select : Cursor.Default); return c ?? (Game.SelectActorsInBox(Game.CellSize * dragEnd, Game.CellSize * dragEnd).Any() ? Cursor.Select : Cursor.Default);