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

big cleanup of Controller mess

Browse Source
This commit is contained in:
Chris Forbes
2010-01-03 16:40:24 +13:00
parent 43498a123e
commit e742097046
9 changed files with 144 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -16,13 +16,14 @@ namespace OpenRa.Game.Orders
public IEnumerable<Order> Order(int2 xy, MouseInput mi)
{
if (mi.IsFake)
{
// this order is never actually issued, but it's used for choosing a cursor
yield return new Order("PlaceBuilding", Producer.Owner.PlayerActor, null, xy, Building.Name);
yield break;
}
if (mi.Button == MouseButton.Right)
Game.controller.CancelInputMode();
return InnerOrder(xy, mi);
}
IEnumerable<Order> InnerOrder(int2 xy, MouseInput mi)
{
if (mi.Button == MouseButton.Left)
{
if (!Game.CanPlaceBuilding(Building, xy, null, true)
@@ -34,8 +35,6 @@ namespace OpenRa.Game.Orders
yield return new Order("PlaceBuilding", Producer.Owner.PlayerActor, null, xy, Building.Name);
}
else
Game.controller.CancelInputMode();
}
public void Tick()
@@ -49,5 +48,10 @@ namespace OpenRa.Game.Orders
{
Game.worldRenderer.uiOverlay.DrawBuildingGrid( Building );
}
public Cursor GetCursor(int2 xy, MouseInput mi)
{
return Cursor.Default;
}
}
}