mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #10452: Support partially built rivers 

This is a workaround for river disconnection caused by RiverMakeWider terraform and/or AyStar being unable to find a path for one of the segments. Instead of jumping into building the next river segment uphill, it just stops at the point of disconnect.
pull/13366/head
SamuXarick 2025-01-23 14:01:01 +00:00
parent 39784240e9
commit d43fad5684
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/landscape.cpp
View File

@ -1284,8 +1284,9 @@ static void River_FoundEndNode(AyStar *aystar, PathNode *current)
* @param end The end of the river. * @param end The end of the river.
* @param spring The springing point of the river. * @param spring The springing point of the river.
* @param main_river Whether the current river is a big river that others flow into. * @param main_river Whether the current river is a big river that others flow into.
* @return true if the river is successfully built, otherwise false.
*/ */
static void BuildRiver(TileIndex begin, TileIndex end, TileIndex spring, bool main_river) static bool BuildRiver(TileIndex begin, TileIndex end, TileIndex spring, bool main_river)
{ {
River_UserData user_data = { spring, main_river }; River_UserData user_data = { spring, main_river };
@ -1302,7 +1303,7 @@ static void BuildRiver(TileIndex begin, TileIndex end, TileIndex spring, bool ma
start.tile = begin; start.tile = begin;
start.td = INVALID_TRACKDIR; start.td = INVALID_TRACKDIR;
finder.AddStartNode(&start, 0); finder.AddStartNode(&start, 0);
finder.Main(); return finder.Main() == AyStarStatus::FoundEndNode;
} }
/** /**
@ -1312,8 +1313,9 @@ static void BuildRiver(TileIndex begin, TileIndex end, TileIndex spring, bool ma
* @param min_river_length The minimum length for the river. * @param min_river_length The minimum length for the river.
* @return First element: True iff a river could/has been built, otherwise false; second element: River ends at sea. * @return First element: True iff a river could/has been built, otherwise false; second element: River ends at sea.
*/ */
static std::tuple<bool, bool> FlowRiver(TileIndex spring, TileIndex begin, uint min_river_length) static std::tuple<bool, bool> FlowRiver(TileIndex &spring, TileIndex begin, uint min_river_length)
{ {
const TileIndex original_spring = spring;
uint height_begin = TileHeight(begin); uint height_begin = TileHeight(begin);
if (IsWaterTile(begin)) { if (IsWaterTile(begin)) {
@ -1383,7 +1385,13 @@ static std::tuple<bool, bool> FlowRiver(TileIndex spring, TileIndex begin, uint
} }
marks.clear(); marks.clear();
if (found) BuildRiver(begin, end, spring, main_river); if (found && spring == original_spring) {
/* This may end being a partially built river. Update the spring location. */
if (!BuildRiver(begin, end, spring, main_river)) {
spring = end;
}
}
return { found, main_river }; return { found, main_river };
} }