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

Fix Service Depot Rally point path finding (+rename ignoredActor)

Browse Source
This commit is contained in:
rob-v
2017-04-09 19:14:25 +02:00
parent 669cf01d80
commit fb1d8d780f
8 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Pathfinder/BasePathSearch.cs
View File

@@ -120,7 +120,7 @@ namespace OpenRA.Mods.Common.Pathfinder
public IPathSearch WithIgnoredActor(Actor b)
{
Graph.IgnoredActor = b;
Graph.IgnoreActor = b;
return this;
}

4
OpenRA.Mods.Common/Pathfinder/PathFinderUnitPathCacheDecorator.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Pathfinder
this.cacheStorage = cacheStorage;
}
public List<CPos> FindUnitPath(CPos source, CPos target, Actor self)
public List<CPos> FindUnitPath(CPos source, CPos target, Actor self, Actor ignoreActor)
{
using (new PerfSample("Pathfinder"))
{
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Pathfinder
if (cachedPath != null)
return cachedPath;
var pb = pathFinder.FindUnitPath(source, target, self);
var pb = pathFinder.FindUnitPath(source, target, self, ignoreActor);
cacheStorage.Store(key, pb);

6
OpenRA.Mods.Common/Pathfinder/PathGraph.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Pathfinder
bool InReverse { get; set; }
Actor IgnoredActor { get; set; }
Actor IgnoreActor { get; set; }
World World { get; }
@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Pathfinder
public Func<CPos, int> CustomCost { get; set; }
public int LaneBias { get; set; }
public bool InReverse { get; set; }
public Actor IgnoredActor { get; set; }
public Actor IgnoreActor { get; set; }
readonly CellConditions checkConditions;
readonly MobileInfo mobileInfo;
@@ -171,7 +171,7 @@ namespace OpenRA.Mods.Common.Pathfinder
int GetCostToNode(CPos destNode, CVec direction)
{
var movementCost = mobileInfo.MovementCostToEnterCell(worldMovementInfo, Actor, destNode, IgnoredActor, checkConditions);
var movementCost = mobileInfo.MovementCostToEnterCell(worldMovementInfo, Actor, destNode, IgnoreActor, checkConditions);
if (movementCost != int.MaxValue && !(CustomBlock != null && CustomBlock(destNode)))
return CalculateCellCost(destNode, direction, movementCost);