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

removed needless cursor indirection

Browse Source
This commit is contained in:
Chris Forbes
2010-02-06 16:18:48 +13:00
parent 4724734454
commit 3b1dc39d6d
16 changed files with 47 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Orders/IOrderGenerator.cs
View File

@@ -7,6 +7,6 @@ namespace OpenRa
IEnumerable<Order> Order( World world, int2 xy, MouseInput mi );
void Tick( World world );
void Render( World world );
Cursor GetCursor( World world, int2 xy, MouseInput mi );
string GetCursor( World world, int2 xy, MouseInput mi );
}
}

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

@@ -53,9 +53,6 @@ namespace OpenRa.Orders
world.WorldRenderer.uiOverlay.DrawBuildingGrid( world, Building, BuildingInfo );
}
public Cursor GetCursor(World world, int2 xy, MouseInput mi)
{
return Cursor.Default;
}
public string GetCursor(World world, int2 xy, MouseInput mi) { return "default"; }
}
}

4
OpenRa.Game/Orders/PowerDownOrderGenerator.cs
View File

@@ -34,11 +34,11 @@ namespace OpenRa.Orders
public void Tick( World world ) { }
public void Render( World world ) { }
public Cursor GetCursor(World world, int2 xy, MouseInput mi)
public string GetCursor(World world, int2 xy, MouseInput mi)
{
mi.Button = MouseButton.Left;
return OrderInner(world, xy, mi).Any()
? Cursor.PowerDown : Cursor.PowerDownBlocked;
? "powerdown" : "powerdown-blocked";
}
}
}

4
OpenRa.Game/Orders/RepairOrderGenerator.cs
View File

@@ -48,11 +48,11 @@ namespace OpenRa.Orders
public void Render( World world ) {}
public Cursor GetCursor(World world, int2 xy, MouseInput mi)
public string GetCursor(World world, int2 xy, MouseInput mi)
{
mi.Button = MouseButton.Left;
return OrderInner(world, xy, mi).Any()
? Cursor.Repair : Cursor.RepairBlocked;
? "repair" : "repair-blocked";
}
}
}

4
OpenRa.Game/Orders/SellOrderGenerator.cs
View File

@@ -36,11 +36,11 @@ namespace OpenRa.Orders
public void Tick( World world ) {}
public void Render( World world ) {}
public Cursor GetCursor(World world, int2 xy, MouseInput mi)
public string GetCursor(World world, int2 xy, MouseInput mi)
{
mi.Button = MouseButton.Left;
return OrderInner(world, xy, mi).Any()
? Cursor.Sell : Cursor.SellBlocked;
? "sell" : "sell-blocked";
}
}
}

38
OpenRa.Game/Orders/UnitOrderGenerator.cs
View File

@@ -36,12 +36,12 @@ namespace OpenRa.Orders
world.WorldRenderer.DrawSelectionBox( a, Color.White, true );
}
public Cursor GetCursor( World world, int2 xy, MouseInput mi )
public string GetCursor( World world, int2 xy, MouseInput mi )
{
return ChooseCursor(world, mi);
}
Cursor ChooseCursor( World world, MouseInput mi )
string ChooseCursor( World world, MouseInput mi )
{
var p = Game.controller.MousePosition;
var c = Order(world, p.ToInt2(), mi)
@@ -51,22 +51,22 @@ namespace OpenRa.Orders
return c ??
(world.SelectActorsInBox(Game.CellSize * p,
Game.CellSize * p).Any()
? Cursor.Select : Cursor.Default);
? "select" : "default");
}
Cursor CursorForOrderString(string s, Actor a, int2 location)
string CursorForOrderString(string s, Actor a, int2 location)
{
var movement = a.traits.GetOrDefault<IMovement>();
switch (s)
{
case "Attack": return Cursor.Attack;
case "Heal": return Cursor.Heal;
case "C4": return Cursor.C4;
case "Attack": return "attack";
case "Heal": return "heal";
case "C4": return "c4";
case "Move":
if (movement.CanEnterCell(location))
return Cursor.Move;
return "move";
else
return Cursor.MoveBlocked;
return "move-blocked";
case "DeployTransform":
var depInfo = a.Info.Traits.Get<TransformsOnDeployInfo>();
var transInfo = Rules.Info[depInfo.TransformsInto];
@@ -74,18 +74,18 @@ namespace OpenRa.Orders
{
var bi = transInfo.Traits.Get<BuildingInfo>();
if (!a.World.CanPlaceBuilding(depInfo.TransformsInto, bi, a.Location + new int2(depInfo.Offset[0], depInfo.Offset[1]), a))
return Cursor.DeployBlocked;
return "deploy-blocked";
}
return Cursor.Deploy;
return "deploy";
case "Deploy": return Cursor.Deploy;
case "Enter": return Cursor.Enter;
case "EnterTransport": return Cursor.Enter;
case "Deliver": return Cursor.Enter;
case "Infiltrate": return Cursor.Enter;
case "Capture": return Cursor.Capture;
case "Harvest": return Cursor.AttackMove;
case "Steal" : return Cursor.Enter;
case "Deploy": return "deploy";
case "Enter": return "enter";
case "EnterTransport": return "enter";
case "Deliver": return "enter";
case "Infiltrate": return "enter";
case "Capture": return "capture";
case "Harvest": return "attackmove";
case "Steal" : return "enter";
default:
return null;
}