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

Merge pull request #7079 from Mailaender/mobile-cursor

Browse Source 
Unhardcoded and self-documented the mobile cursor definitions
This commit is contained in:
obrakmann
2014-12-06 21:25:01 +01:00
parent f246475b81 74d22f4db2
commit 01b44f0478
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -56,6 +56,9 @@ namespace OpenRA.Mods.RA.Move
[Desc("Can the actor be ordered to move in to shroud?")] [Desc("Can the actor be ordered to move in to shroud?")]
public readonly bool MoveIntoShroud = true; public readonly bool MoveIntoShroud = true;
public readonly string Cursor = "move";
public readonly string BlockedCursor = "move-blocked";
public virtual object Create(ActorInitializer init) { return new Mobile(init, this); } public virtual object Create(ActorInitializer init) { return new Mobile(init, this); }
static object LoadSpeeds(MiniYaml y) static object LoadSpeeds(MiniYaml y)
@@ -620,12 +623,10 @@ namespace OpenRA.Mods.RA.Move
var explored = self.Owner.Shroud.IsExplored(location); var explored = self.Owner.Shroud.IsExplored(location);
cursor = self.World.Map.Contains(location) ? cursor = self.World.Map.Contains(location) ?
(self.World.Map.GetTerrainInfo(location).CustomCursor ?? "move") : (self.World.Map.GetTerrainInfo(location).CustomCursor ?? unitType.Cursor) : unitType.BlockedCursor;
"move-blocked";
if ((!explored && !unitType.MoveIntoShroud) || if ((!explored && !unitType.MoveIntoShroud) || (explored && unitType.MovementCostForCell(self.World, location) == int.MaxValue))
(explored && unitType.MovementCostForCell(self.World, location) == int.MaxValue)) cursor = unitType.BlockedCursor;
cursor = "move-blocked";
return true; return true;
} }