Fix #10452: Don't let AyStar max_search_nodes unattended when initial…

…izing Add a constant with the default value of 10000 and have the pathfinding settings refer to it. Add a preventative method to AyStar when it's initializing, to limit the number of max_search_nodes if this is left unattended.
OpenTTD · Dec 16, 2023 · e7b23a3 · e7b23a3
1 parent 0b6a7dd
commit e7b23a3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/src/landscape.cpp b/src/landscape.cpp
@@ -1308,7 +1308,6 @@ static void BuildRiver(TileIndex begin, TileIndex end, TileIndex spring, bool ma
 	finder.FoundEndNode = River_FoundEndNode;
 	finder.user_target = &end;
 	finder.user_data = &user_data;
-	finder.max_search_nodes = _settings_game.pf.npf.npf_max_search_nodes;
 
 	finder.Init(River_Hash, 1 << RIVER_HASH_SIZE);
 

diff --git a/src/pathfinder/npf/aystar.cpp b/src/pathfinder/npf/aystar.cpp
@@ -301,4 +301,9 @@ void AyStar::Init(Hash_HashProc hash, uint num_buckets)
 	 *  When that one gets full it reserves another one, till this number
 	 *  That is why it can stay this high */
 	this->openlist_queue.Init(102400);
+
+	/* Limit the number of nodes expanded by default
+	 *  This is a preventive method as this should never be left unattended
+	 *  It can be modified afterwards */
+	this->max_search_nodes = AYSTAR_MAX_SEARCH_NODES;
 }
diff --git a/src/pathfinder/npf/aystar.h b/src/pathfinder/npf/aystar.h
@@ -20,6 +20,8 @@
 #include "../../tile_type.h"
 #include "../../track_type.h"
 
+static const int AYSTAR_MAX_SEARCH_NODES = 12312; ///< Reference limit for #AyStar::max_search_nodes
+
 /** Return status of #AyStar methods. */
 enum AystarStatus {
 	AYSTAR_FOUND_END_NODE, ///< An end node was found.

diff --git a/src/pathfinder/pathfinder_type.h b/src/pathfinder/pathfinder_type.h
@@ -11,6 +11,7 @@
 #define PATHFINDER_TYPE_H
 
 #include "../tile_type.h"
+#include "npf/aystar.h"
 
 /** Length (penalty) of one tile with NPF */
 static const int NPF_TILE_LENGTH = 100;

diff --git a/src/table/settings/pathfinding_settings.ini b/src/table/settings/pathfinding_settings.ini
@@ -168,7 +168,7 @@ cat      = SC_EXPERT
 [SDT_VAR]
 var      = pf.npf.npf_max_search_nodes
 type     = SLE_UINT
-def      = 10000
+def      = AYSTAR_MAX_SEARCH_NODES
 min      = 500
 max      = 100000
 cat      = SC_EXPERT
@@ -325,7 +325,7 @@ cat      = SC_EXPERT
 var      = pf.yapf.max_search_nodes
 type     = SLE_UINT
 from     = SLV_28
-def      = 10000
+def      = AYSTAR_MAX_SEARCH_NODES
 min      = 500
 max      = 1000000
 cat      = SC_EXPERT