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

minicursors for minimap.

Browse Source 
Bugs: ra doesn't define a sequence for move-blocked-minimap; cursor hotspot is wrong.
This commit is contained in:
Paul Chote
2010-07-21 00:26:32 +12:00
parent bd69047e8c
commit 7d02a801ad
4 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -55,24 +55,15 @@ namespace OpenRA.Orders
public string GetCursor( World world, int2 xy, MouseInput mi )
{
return ChooseCursor(world, mi);
}
var c = Order(world, xy, mi)
.Select(o => o.Subject.traits.WithInterface<IProvideCursor>()
.Select(pc => pc.CursorForOrderString(o.OrderString, o.Subject, o.TargetLocation)).FirstOrDefault(a => a != null))
.FirstOrDefault(a => a != null);
string ChooseCursor(World world, MouseInput mi)
{
//using (new PerfSample("cursor"))
{
var p = Game.controller.MousePosition;
var c = Order(world, p.ToInt2(), mi)
.Select(o => o.Subject.traits.WithInterface<IProvideCursor>()
.Select(pc => pc.CursorForOrderString(o.OrderString, o.Subject, o.TargetLocation)).FirstOrDefault(a => a != null))
.FirstOrDefault(a => a != null);
return c ??
(world.SelectActorsInBox(Game.CellSize * p,
Game.CellSize * p).Any()
? "select" : "default");
}
return c ??
(world.SelectActorsInBox(Game.CellSize * xy,
Game.CellSize * xy).Any()
? "select" : "default");
}
}
}