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

Fix CursorForOrderString to work with orders + preliminary e6 fixes

Browse Source
This commit is contained in:
Paul Chote
2010-07-23 17:11:52 +12:00
parent 5019bb8b6e
commit 71420df0f3
25 changed files with 179 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Traits/Mobile.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Traits
public virtual object Create(ActorInitializer init) { return new Mobile(init, this); }
}
public class Mobile : IIssueOrder, IResolveOrder, IOccupySpace, IMove, IProvideCursor, INudge
public class Mobile : IIssueOrder, IResolveOrder, IOccupySpace, IMove, IOrderCursor, INudge
{
public readonly Actor self;
public readonly MobileInfo Info;
@@ -112,12 +112,12 @@ namespace OpenRA.Traits
}
}
public string CursorForOrderString(string s, Actor a, int2 location)
public string CursorForOrder(Actor self, Order order)
{
if (s != "Move")
if (order.OrderString != "Move")
return null;
return (CanEnterCell(location)) ? "move" : "move-blocked";
return (CanEnterCell(order.TargetLocation)) ? "move" : "move-blocked";
}
public int2 TopLeft { get { return toCell; } }