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

better cursor handling

Browse Source
This commit is contained in:
Chris Forbes
2009-10-29 22:42:15 +13:00
parent 7a5d75c393
commit 4689a7fd05
4 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenRa.Game/Controller.cs
View File

@@ -96,29 +96,36 @@ namespace OpenRa.Game
public Cursor ChooseCursor()
{
var uog = orderGenerator as UnitOrderGenerator;
var c = (orderGenerator != null) ? orderGenerator.Order(dragEnd.ToInt2(), false)
.Select(a => a.Cursor)
.FirstOrDefault(a => a != null) : null;
if (uog != null)
uog.selection.RemoveAll(a => a.IsDead);
return c ?? (Game.SelectUnitOrBuilding(Game.CellSize * dragEnd).Any() ? Cursor.Select : Cursor.Default);
if (uog != null && uog.selection.Count > 0
&& uog.selection.Any(a => a.traits.Contains<Traits.Mobile>())
&& uog.selection.All(a => a.Owner == Game.LocalPlayer))
{
var umts = uog.selection.Select(a => a.traits.GetOrDefault<Mobile>())
.Where(m => m != null)
.Select(m => m.GetMovementType())
.Distinct();
//foreach( var o in
//var uog = orderGenerator as UnitOrderGenerator;
if (!umts.Any(umt => Game.IsCellBuildable(dragEnd.ToInt2(), umt)))
return Cursor.MoveBlocked;
return Cursor.Move;
}
//if (uog != null)
// uog.selection.RemoveAll(a => a.IsDead);
if (Game.SelectUnitOrBuilding(Game.CellSize * dragEnd).Any())
return Cursor.Select;
//if (uog != null && uog.selection.Count > 0
// && uog.selection.Any(a => a.traits.Contains<Traits.Mobile>())
// && uog.selection.All(a => a.Owner == Game.LocalPlayer))
//{
// var umts = uog.selection.Select(a => a.traits.GetOrDefault<Mobile>())
// .Where(m => m != null)
// .Select(m => m.GetMovementType())
// .Distinct();
return Cursor.Default;
// if (!umts.Any(umt => Game.IsCellBuildable(dragEnd.ToInt2(), umt)))
// return Cursor.MoveBlocked;
// return Cursor.Move;
//}
//if (Game.SelectUnitOrBuilding(Game.CellSize * dragEnd).Any())
// return Cursor.Select;
//return Cursor.Default;
}
}
}