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

air units are targetable

Browse Source
This commit is contained in:
Chris Forbes
2009-12-28 12:54:43 +13:00
parent daaf9686b7
commit bf6c30e9ef
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRa.Game/Actor.cs
View File

@@ -92,11 +92,8 @@ namespace OpenRa.Game
if (!Rules.Map.IsInMap(xy.X, xy.Y)) if (!Rules.Map.IsInMap(xy.X, xy.Y))
return null; return null;
// HACK: Get the first unit in the cell var loc = mi.Location + Game.viewport.Location;
// This will need to be updated for multiple-infantry-in-a-cell var underCursor = Game.FindUnits(loc, loc).FirstOrDefault();
// HACK: this doesn't work for targeting air units either
var underCursor = Game.UnitInfluence.GetUnitsAt( xy ).FirstOrDefault()
?? Game.BuildingInfluence.GetBuildingAt( xy );
if (underCursor != null && !underCursor.Info.Selectable) if (underCursor != null && !underCursor.Info.Selectable)
underCursor = null; underCursor = null;

2
OpenRa.Game/Controller.cs
View File

@@ -124,7 +124,7 @@ namespace OpenRa.Game
{ {
var mods = GetModifierKeys(); var mods = GetModifierKeys();
var c = (orderGenerator is UnitOrderGenerator) ? orderGenerator.Order(dragEnd.ToInt2(), var c = (orderGenerator is UnitOrderGenerator) ? orderGenerator.Order(dragEnd.ToInt2(),
new MouseInput { Button = MouseButton.Right, Modifiers = mods }) new MouseInput { Location = (Game.CellSize * dragEnd - Game.viewport.Location).ToInt2(), Button = MouseButton.Right, Modifiers = mods })
.Where(o => o.Validate()) .Where(o => o.Validate())
.Select(o => CursorForOrderString(o.OrderString, o.Subject, o.TargetLocation)) .Select(o => CursorForOrderString(o.OrderString, o.Subject, o.TargetLocation))
.FirstOrDefault(a => a != null) : null; .FirstOrDefault(a => a != null) : null;