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

enum SubCell => int & Dictionary<SubCell, WVec> => WVec[]

Browse Source
This commit is contained in:
atlimit8
2014-07-29 08:33:46 -05:00
parent e3d85f29c9
commit 43478dd500
13 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,14 +133,14 @@ namespace OpenRA.Mods.RA.Move
return TilesetMovementClass[tileset];
}
public static readonly Dictionary<SubCell, WVec> SubCellOffsets = new Dictionary<SubCell, WVec>()
public static readonly WVec[] SubCellOffsets =
{
{SubCell.TopLeft, new WVec(-299, -256, 0)},
{SubCell.TopRight, new WVec(256, -256, 0)},
{SubCell.Center, new WVec(0, 0, 0)},
{SubCell.BottomLeft, new WVec(-299, 256, 0)},
{SubCell.BottomRight, new WVec(256, 256, 0)},
{SubCell.FullCell, new WVec(0, 0, 0)},
new WVec(0, 0, 0),
new WVec(-299, -256, 0),
new WVec(256, -256, 0),
new WVec(0, 0, 0),
new WVec(-299, 256, 0),
new WVec(256, 256, 0),
};
static bool IsMovingInMyDirection(Actor self, Actor other)
@@ -208,7 +208,7 @@ namespace OpenRA.Mods.RA.Move
int __facing;
CPos __fromCell, __toCell;
public SubCell fromSubCell, toSubCell;
public int fromSubCell, toSubCell;
//int __altitude;
@@ -226,7 +226,7 @@ namespace OpenRA.Mods.RA.Move
[Sync] public int PathHash; // written by Move.EvalPath, to temporarily debug this crap.
public void SetLocation(CPos from, SubCell fromSub, CPos to, SubCell toSub)
public void SetLocation(CPos from, int fromSub, CPos to, int toSub)
{
if (fromCell == from && toCell == to && fromSubCell == fromSub && toSubCell == toSub)
return;
@@ -248,10 +248,11 @@ namespace OpenRA.Mods.RA.Move
this.self = init.self;
this.Info = info;
toSubCell = fromSubCell = info.SharesCell ? SubCell.Center : SubCell.FullCell;
// TODO replace 3 w/ SubCellDefaultIndex
toSubCell = fromSubCell = info.SharesCell ? 3 : 0;
if (init.Contains<SubCellInit>())
{
this.fromSubCell = this.toSubCell = init.Get<SubCellInit, SubCell>();
this.fromSubCell = this.toSubCell = init.Get<SubCellInit, int>();
}
if (init.Contains<LocationInit>())
@@ -414,7 +415,7 @@ namespace OpenRA.Mods.RA.Move
public CPos TopLeft { get { return toCell; } }
public IEnumerable<Pair<CPos, SubCell>> OccupiedCells()
public IEnumerable<Pair<CPos, int>> OccupiedCells()
{
if (fromCell == toCell)
yield return Pair.New(fromCell, fromSubCell);
@@ -427,14 +428,13 @@ namespace OpenRA.Mods.RA.Move
}
}
public SubCell GetDesiredSubcell(CPos a, Actor ignoreActor)
public int GetDesiredSubcell(CPos a, Actor ignoreActor)
{
if (!Info.SharesCell)
return SubCell.FullCell;
return 0;
// Prioritise the current subcell
return new[]{ fromSubCell, SubCell.TopLeft, SubCell.TopRight, SubCell.Center,
SubCell.BottomLeft, SubCell.BottomRight}.First(b =>
return new[]{ fromSubCell, 1, 2, 3, 4, 5}.First(b =>
{
var blockingActors = self.World.ActorMap.GetUnitsAt(a, b).Where(c => c != ignoreActor);
if (blockingActors.Any())

2
OpenRA.Mods.RA/Move/Move.cs
View File

@@ -180,7 +180,7 @@ namespace OpenRA.Mods.RA.Move
}
}
Pair<CPos, SubCell>? PopPath(Actor self, Mobile mobile)
Pair<CPos, int>? PopPath(Actor self, Mobile mobile)
{
if (path.Count == 0)
return null;

2
OpenRA.Mods.RA/Move/PathFinder.cs
View File

@@ -80,7 +80,7 @@ namespace OpenRA.Mods.RA.Move
}
}
public List<CPos> FindUnitPathToRange(CPos src, SubCell srcSub, WPos target, WRange range, Actor self)
public List<CPos> FindUnitPathToRange(CPos src, int srcSub, WPos target, WRange range, Actor self)
{
using (new PerfSample("Pathfinder"))
{