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

Fixing pathfinding calc when the distance was to small for the bidirectional logic to work.

Browse Source
This commit is contained in:
teinarss
2018-07-10 16:53:01 +02:00
committed by abcdefg30
parent 1c0aa24640
commit 25a8de8a47
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/World/PathFinder.cs
View File

@@ -70,6 +70,10 @@ namespace OpenRA.Mods.Common.Traits
if (domainIndex != null && !domainIndex.IsPassable(source, target, li)) if (domainIndex != null && !domainIndex.IsPassable(source, target, li))
return EmptyPath; return EmptyPath;
var distance = source - target;
if (distance.LengthSquared < 3 && li.CanMoveFreelyInto(world, self, target, null, CellConditions.All))
return new List<CPos> { target };
List<CPos> pb; List<CPos> pb;
using (var fromSrc = PathSearch.FromPoint(world, li, self, target, source, true).WithIgnoredActor(ignoreActor)) using (var fromSrc = PathSearch.FromPoint(world, li, self, target, source, true).WithIgnoredActor(ignoreActor))
using (var fromDest = PathSearch.FromPoint(world, li, self, source, target, true).WithIgnoredActor(ignoreActor).Reverse()) using (var fromDest = PathSearch.FromPoint(world, li, self, source, target, true).WithIgnoredActor(ignoreActor).Reverse())
@@ -143,7 +147,6 @@ namespace OpenRA.Mods.Common.Traits
{ {
// make some progress on the first search // make some progress on the first search
var p = fromSrc.Expand(); var p = fromSrc.Expand();
if (fromDest.Graph[p].Status == CellStatus.Closed && if (fromDest.Graph[p].Status == CellStatus.Closed &&
fromDest.Graph[p].CostSoFar < int.MaxValue) fromDest.Graph[p].CostSoFar < int.MaxValue)
{ {
@@ -153,7 +156,6 @@ namespace OpenRA.Mods.Common.Traits
// make some progress on the second search // make some progress on the second search
var q = fromDest.Expand(); var q = fromDest.Expand();
if (fromSrc.Graph[q].Status == CellStatus.Closed && if (fromSrc.Graph[q].Status == CellStatus.Closed &&
fromSrc.Graph[q].CostSoFar < int.MaxValue) fromSrc.Graph[q].CostSoFar < int.MaxValue)
{ {