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

bail out early before trying impossible paths

Browse Source
This commit is contained in:
Matthias Mailänder
2015-08-23 19:21:13 +02:00
parent 64bbfe4121
commit 7108344501
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Activities/FindResources.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA.Mods.Common.Activities
readonly ResourceLayer resLayer; readonly ResourceLayer resLayer;
readonly ResourceClaimLayer territory; readonly ResourceClaimLayer territory;
readonly IPathFinder pathFinder; readonly IPathFinder pathFinder;
readonly DomainIndex domainIndex;
CPos? avoidCell; CPos? avoidCell;
@@ -39,6 +40,7 @@ namespace OpenRA.Mods.Common.Activities
resLayer = self.World.WorldActor.Trait<ResourceLayer>(); resLayer = self.World.WorldActor.Trait<ResourceLayer>();
territory = self.World.WorldActor.TraitOrDefault<ResourceClaimLayer>(); territory = self.World.WorldActor.TraitOrDefault<ResourceClaimLayer>();
pathFinder = self.World.WorldActor.Trait<IPathFinder>(); pathFinder = self.World.WorldActor.Trait<IPathFinder>();
domainIndex = self.World.WorldActor.Trait<DomainIndex>();
} }
public FindResources(Actor self, CPos avoidCell) public FindResources(Actor self, CPos avoidCell)
@@ -142,8 +144,9 @@ namespace OpenRA.Mods.Common.Activities
var searchRadius = harv.LastOrderLocation.HasValue ? harvInfo.SearchFromOrderRadius : harvInfo.SearchFromProcRadius; var searchRadius = harv.LastOrderLocation.HasValue ? harvInfo.SearchFromOrderRadius : harvInfo.SearchFromProcRadius;
var searchRadiusSquared = searchRadius * searchRadius; var searchRadiusSquared = searchRadius * searchRadius;
var passable = (uint)mobileInfo.GetMovementClass(self.World.TileSet);
var search = PathSearch.Search(self.World, mobileInfo, self, true, var search = PathSearch.Search(self.World, mobileInfo, self, true,
loc => IsHarvestable(self, loc)) loc => domainIndex.IsPassable(self.Location, loc, passable) && IsHarvestable(self, loc))
.WithCustomCost(loc => .WithCustomCost(loc =>
{ {
if ((avoidCell.HasValue && loc == avoidCell.Value) || if ((avoidCell.HasValue && loc == avoidCell.Value) ||