gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 07:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Tidy up variables in River_FoundEndNode (#13276)

Browse Source
This commit is contained in:
SamuXarick 2025-01-04 20:39:07 +00:00 committed by GitHub
parent 76cc3438bf
commit e543768570
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/landscape.cpp
View File

@ -1256,8 +1256,7 @@ static void River_FoundEndNode(AyStar *aystar, PathNode *current)
River_UserData *data = (River_UserData *)aystar->user_data; River_UserData *data = (River_UserData *)aystar->user_data;
/* First, build the river without worrying about its width. */ /* First, build the river without worrying about its width. */
uint cur_pos = 0; for (PathNode *path = current->parent; path != nullptr; path = path->parent) {
for (PathNode *path = current->parent; path != nullptr; path = path->parent, cur_pos++) {
TileIndex tile = path->GetTile(); TileIndex tile = path->GetTile();
if (!IsWaterTile(tile)) { if (!IsWaterTile(tile)) {
MakeRiverAndModifyDesertZoneAround(tile); MakeRiverAndModifyDesertZoneAround(tile);
@ -1269,16 +1268,13 @@ static void River_FoundEndNode(AyStar *aystar, PathNode *current)
*/ */
if (_settings_game.game_creation.land_generator != LG_ORIGINAL && data->main_river) { if (_settings_game.game_creation.land_generator != LG_ORIGINAL && data->main_river) {
const uint long_river_length = _settings_game.game_creation.min_river_length * 4; const uint long_river_length = _settings_game.game_creation.min_river_length * 4;
uint current_river_length;
uint radius;
cur_pos = 0; for (PathNode *path = current->parent; path != nullptr; path = path->parent) {
for (PathNode *path = current->parent; path != nullptr; path = path->parent, cur_pos++) {
TileIndex tile = path->GetTile(); TileIndex tile = path->GetTile();
/* Check if we should widen river depending on how far we are away from the source. */ /* Check if we should widen river depending on how far we are away from the source. */
current_river_length = DistanceManhattan(data->spring, tile); uint current_river_length = DistanceManhattan(data->spring, tile);
radius = std::min(3u, (current_river_length / (long_river_length / 3u)) + 1u); uint radius = std::min(3u, (current_river_length / (long_river_length / 3u)) + 1u);
if (radius > 1) CircularTileSearch(&tile, radius, RiverMakeWider, (void *)&path->key.tile); if (radius > 1) CircularTileSearch(&tile, radius, RiverMakeWider, (void *)&path->key.tile);
} }