mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 20:49:11 +00:00
Code Issues Activity

Codechange: use TileArea to search for trees

Browse Source
This commit is contained in:
Susan
2024-06-04 11:30:14 +01:00
parent 6335312b3c
commit 6d40780434
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tree_cmd.cpp
View File

@@ -58,6 +58,7 @@ static const uint16_t DEFAULT_TREE_STEPS = 1000; ///< Default number
static const uint16_t DEFAULT_RAINFOREST_TREE_STEPS = 15000; ///< Default number of attempts for placing extra trees at rainforest in tropic. static const uint16_t DEFAULT_RAINFOREST_TREE_STEPS = 15000; ///< Default number of attempts for placing extra trees at rainforest in tropic.
static const uint16_t EDITOR_TREE_DIV = 5; ///< Game editor tree generation divisor factor. static const uint16_t EDITOR_TREE_DIV = 5; ///< Game editor tree generation divisor factor.
static const uint16_t FOREST_THRESHOLD = 6; ///< Minimum amount of trees required to be considered a forest. static const uint16_t FOREST_THRESHOLD = 6; ///< Minimum amount of trees required to be considered a forest.
static const uint16_t FOREST_SEARCH_RADIUS = 2; ///< Radius of area to examine when determining forest status.
/** /**
* Tests if a tile can be converted to MP_TREES * Tests if a tile can be converted to MP_TREES
@@ -96,13 +97,9 @@ static bool IsNearbyForest(TileIndex tile)
if (IsTileType(tile, MP_TREES)) return true; if (IsTileType(tile, MP_TREES)) return true;
/* Count the trees around the clear tile to determine if it's near a forest */ /* Count the trees around the clear tile to determine if it's near a forest */
for (int x = -2; x <= 2; x++) { for (TileIndex t : TileArea(tile).Expand(FOREST_SEARCH_RADIUS)) {
for (int y = -2; y <= 2; y++) { if (IsTileType(t, MP_TREES)) {
TileIndex vincity = TileAddWrap(tile, x, y); planted_tile_count++;
if (vincity != INVALID_TILE &&
IsTileType(vincity, MP_TREES)) {
planted_tile_count++;
}
} }
} }