Feature: Region-based pathfinder for ships

OpenTTD · Mar 7, 2023 · 0c0165b · 0c0165b
1 parent 87f4d37
commit 0c0165b
Show file tree

Hide file tree

Showing 16 changed files with 1,135 additions and 41 deletions.
diff --git a/src/genworld.cpp b/src/genworld.cpp
@@ -34,6 +34,7 @@
 #include "string_func.h"
 #include "thread.h"
 #include "tgp.h"
+#include "pathfinder/water_regions.h" // TODO KB for ship pathfinder reset
 
 #include "safeguards.h"
 
@@ -173,6 +174,8 @@ static void _GenerateWorld()
 			}
 		}
 
+		ResetShipPathfinder();
+
 		BasePersistentStorageArray::SwitchMode(PSM_LEAVE_GAMELOOP);
 
 		ResetObjectToPlace();

diff --git a/src/misc.cpp b/src/misc.cpp
@@ -105,6 +105,7 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 	InitializeIndustries();
 	InitializeObjects();
 	InitializeBuildingCounts();
+	//ResetShipPathfinder(); // TODO KB figure out if it's necessary or not
 
 	InitializeNPF();
 

diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
@@ -28,6 +28,7 @@
 #include "viewport_func.h"
 #include "landscape_cmd.h"
 #include "rev.h"
+#include "pathfinder/water_regions.h"
 
 #include "widgets/misc_widget.h"
 
@@ -128,6 +129,9 @@ class LandInfoWindow : public Window {
 		Debug(misc, LANDINFOD_LEVEL, "m7     = {:#x}", tile.m7());
 		Debug(misc, LANDINFOD_LEVEL, "m8     = {:#x}", tile.m8());
 #undef LANDINFOD_LEVEL
+
+		// TODO debug code, remove again
+		DEBUG_UpdateWaterRegion(tile);
 	}
 
 	void OnInit() override

diff --git a/src/pathfinder/CMakeLists.txt b/src/pathfinder/CMakeLists.txt
@@ -5,4 +5,6 @@ add_files(
     follow_track.hpp
     pathfinder_func.h
     pathfinder_type.h
+    water_regions.h
+    water_regions.cpp
 )