dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Public roads: Dynamically set A* max search nodes"

Browse Source 
This reverts commit acd67a0d0b.
This commit is contained in:
Jonathan G Rennison
2023-02-26 15:45:41 +00:00
parent 8e5371eec4
commit db224585eb
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/road.cpp
View File

@@ -947,6 +947,7 @@ static AyStar PublicRoadAyStar()
finder.GetNeighbours = PublicRoad_GetNeighbours; finder.GetNeighbours = PublicRoad_GetNeighbours;
finder.EndNodeCheck = PublicRoad_EndNodeCheck; finder.EndNodeCheck = PublicRoad_EndNodeCheck;
finder.FoundEndNode = PublicRoad_FoundEndNode; finder.FoundEndNode = PublicRoad_FoundEndNode;
finder.max_search_nodes = 1 << 20;
return finder; return finder;
} }
@@ -954,9 +955,6 @@ static bool PublicRoadFindPath(AyStar& finder, const TileIndex from, TileIndex t
{ {
finder.user_target = reinterpret_cast<void *>(static_cast<uintptr_t>(to)); finder.user_target = reinterpret_cast<void *>(static_cast<uintptr_t>(to));
uint distance = DistanceManhattan(from, to);
finder.max_search_nodes = Clamp<uint32>(distance * distance * 64, 1 << 10, 1 << 20);
finder.Init(1 << _public_road_hash_size); finder.Init(1 << _public_road_hash_size);
AyStarNode start {}; AyStarNode start {};