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

Updated TerrainInfo cost to use short

Browse Source
This commit is contained in:
teinarss
2019-07-07 19:52:23 +02:00
committed by reaperrr
parent 27077d6427
commit fb1af81280
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/World/Locomotor.cs
View File

@@ -79,9 +79,9 @@ namespace OpenRA.Mods.Common.Traits
{ {
var nodesDict = t.Value.ToDictionary(); var nodesDict = t.Value.ToDictionary();
var cost = nodesDict.ContainsKey("PathingCost") var cost = nodesDict.ContainsKey("PathingCost")
? FieldLoader.GetValue<int>("cost", nodesDict["PathingCost"].Value) ? FieldLoader.GetValue<short>("cost", nodesDict["PathingCost"].Value)
: 10000 / speed; : 10000 / speed;
ret.Add(t.Key, new TerrainInfo(speed, cost)); ret.Add(t.Key, new TerrainInfo(speed, (short)cost));
} }
} }
@@ -108,16 +108,16 @@ namespace OpenRA.Mods.Common.Traits
{ {
public static readonly TerrainInfo Impassable = new TerrainInfo(); public static readonly TerrainInfo Impassable = new TerrainInfo();
public readonly int Cost; public readonly short Cost;
public readonly int Speed; public readonly int Speed;
public TerrainInfo() public TerrainInfo()
{ {
Cost = int.MaxValue; Cost = short.MaxValue;
Speed = 0; Speed = 0;
} }
public TerrainInfo(int speed, int cost) public TerrainInfo(int speed, short cost)
{ {
Speed = speed; Speed = speed;
Cost = cost; Cost = cost;
@@ -168,7 +168,7 @@ namespace OpenRA.Mods.Common.Traits
public int CalculateTilesetMovementClass(TileSet tileset) public int CalculateTilesetMovementClass(TileSet tileset)
{ {
// collect our ability to cross *all* terraintypes, in a bitvector // collect our ability to cross *all* terraintypes, in a bitvector
return TilesetTerrainInfo[tileset].Select(ti => ti.Cost < int.MaxValue).ToBits(); return TilesetTerrainInfo[tileset].Select(ti => ti.Cost < short.MaxValue).ToBits();
} }
public uint GetMovementClass(TileSet tileset) public uint GetMovementClass(TileSet tileset)