cpp/openttd-patchpack/source Changeset - r26748:90d55b3e0b5c

Changeset - r26748:90d55b3e0b5c

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Tyler Trahan - 17 months ago 2023-01-14 13:20:19
tyler@tylertrahan.com

Fix: Various Wide River issues (#10348)

1 file changed with 16 insertions and 3 deletions:

src/landscape.cpp

0 comments (0 inline, 0 general)

src/landscape.cpp

➞

Show inline comments

@@ @@ -1093,7 +1093,7 @@ static bool RiverMakeWider(TileIndex til @@
 	/* If the tile is at height 0 after terraforming but the ocean hasn't flooded yet, don't build river. */
 	if (GetTileMaxZ(tile) == 0) return false;
-	TileIndex origin_tile = *(TileIndex *)data;;
 	TileIndex origin_tile = *(TileIndex *)data;
 	Slope cur_slope = GetTileSlope(tile);
 	Slope desired_slope = GetTileSlope(origin_tile); // Initialize matching the origin tile as a shortcut if no terraforming is needed.
@@ @@ -1131,7 +1131,7 @@ static bool RiverMakeWider(TileIndex til @@
+					}
+				}
 				/* If we find an adjacent river tile, remember it. We'll terraform to match it later if we don't find a slope. */
-				if (IsTileFlat(tile)) flat_river_found = true;
+				if (IsTileFlat(other_tile)) flat_river_found = true;
+			}
+		}
 		/* We didn't find either an inclined or flat river, so we're climbing the wrong slope. Bail out. */
@@ @@ -1203,6 +1203,11 @@ static bool RiverMakeWider(TileIndex til @@
 			if (GetTileSlope(downstream_tile) != SLOPE_FLAT) return false;
 			MakeRiver(downstream_tile, Random());
 			MarkTileDirtyByTile(downstream_tile);
 			/* Remove desert directly around the river tile. */
 			TileIndex cur_tile = downstream_tile;
 			CircularTileSearch(&cur_tile, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, nullptr);
+		}
 		/* If upstream is dry and flat, try making it a river tile. */
@@ @@ -1211,16 +1216,21 @@ static bool RiverMakeWider(TileIndex til @@
 			if (GetTileSlope(upstream_tile) != SLOPE_FLAT) return false;
 			MakeRiver(upstream_tile, Random());
 			MarkTileDirtyByTile(upstream_tile);
 			/* Remove desert directly around the river tile. */
 			TileIndex cur_tile = upstream_tile;
 			CircularTileSearch(&cur_tile, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, nullptr);
+		}
+	}
 	/* If the tile slope matches the desired slope, add a river tile. */
 	if (cur_slope == desired_slope) {
 		MakeRiver(tile, Random());
 		MarkTileDirtyByTile(tile);
 		/* Remove desert directly around the river tile. */
 		TileIndex cur_tile = tile;
 		MarkTileDirtyByTile(cur_tile);
 		CircularTileSearch(&cur_tile, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, nullptr);
+	}
@@ @@ -1494,6 +1504,9 @@ static void CreateRivers() @@
+		}
+	}
 	/* Widening rivers may have left some tiles requiring to be watered. */
 	ConvertGroundTilesIntoWaterTiles();
 	/* Run tile loop to update the ground density. */
 	for (uint i = 0; i != 256; i++) {
 		if (i % 64 == 0) IncreaseGeneratingWorldProgress(GWP_RIVER);

0 comments (0 inline, 0 general)