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

Load subcells and default subcell index from mod.yaml

Browse Source
This commit is contained in:
atlimit8
2014-07-31 18:20:52 -05:00
parent 4b7537bb13
commit 9b30c21f93
9 changed files with 95 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Traits/World/ActorMap.cs
View File

@@ -33,8 +33,6 @@ namespace OpenRA.Traits
public Actor Actor;
}
static readonly int[] SubCells = { 1, 2, 3, 4, 5 };
readonly ActorMapInfo info;
readonly Map map;
readonly CellLayer<InfluenceNode> influence;
@@ -87,18 +85,18 @@ namespace OpenRA.Traits
public bool HasFreeSubCell(CPos a)
{
if (!AnyUnitsAt(a))
return true;
return SubCells.Any(b => !AnyUnitsAt(a, b));
return FreeSubCell(a) >= 0;
}
public int? FreeSubCell(CPos a)
public int FreeSubCell(CPos a)
{
if (!HasFreeSubCell(a))
return null;
if (!AnyUnitsAt(a))
return map.SubCellDefaultIndex;
return SubCells.First(b => !AnyUnitsAt(a, b));
for (var i = 1; i < map.SubCellOffsets.Length; ++i)
if (!AnyUnitsAt(a, i))
return i;
return -1;
}
public bool AnyUnitsAt(CPos a)