Merge branch 'master' into jgrpp

# Conflicts: # src/landscape.cpp
2022-10-22 19:52:51 +01:00
parent 29a1e49c28 4daad7f348
commit ff0b3ca9be
3 changed files with 10 additions and 1 deletions
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -1247,7 +1247,7 @@ static void River_FoundEndNode(AyStar *aystar, OpenListNode *current)

 			MarkTileDirtyByTile(tile);

-			if (_is_main_river && (radius > 1)) {
+			if (_settings_game.game_creation.land_generator != LG_ORIGINAL && _is_main_river && (radius > 1)) {
 				CircularTileSearch(&tile, radius + RandomRange(1), RiverMakeWider, (void *)&path->node.tile);
 			} else {
 				/* Remove desert directly around the river tile. */