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

Fix: Trees disappear completely after a few years when they're not allowed to spread

pull/8170/head
dP 2020-05-18 18:50:12 +03:00 committed by Michael Lutz
parent 6a8b02609f
commit 82572754dd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tree_cmd.cpp
View File

@ -632,6 +632,13 @@ static void TileLoopTreesAlps(TileIndex tile)
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
} }
static bool CanPlantExtraTrees(TileIndex tile)
{
return ((_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_RAINFOREST) ?
_settings_game.construction.extra_tree_placement != ETP_NONE :
_settings_game.construction.extra_tree_placement == ETP_ALL);
}
static void TileLoop_Trees(TileIndex tile) static void TileLoop_Trees(TileIndex tile)
{ {
if (GetTreeGround(tile) == TREE_GROUND_SHORE) { if (GetTreeGround(tile) == TREE_GROUND_SHORE) {
@ -682,12 +689,7 @@ static void TileLoop_Trees(TileIndex tile)
FALLTHROUGH; FALLTHROUGH;
case 2: { // add a neighbouring tree case 2: { // add a neighbouring tree
/* Don't plant extra trees if that's not allowed. */ if (!CanPlantExtraTrees(tile)) break;
if ((_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_RAINFOREST) ?
_settings_game.construction.extra_tree_placement == ETP_NONE :
_settings_game.construction.extra_tree_placement != ETP_ALL) {
break;
}
TreeType treetype = GetTreeType(tile); TreeType treetype = GetTreeType(tile);
@ -715,6 +717,9 @@ static void TileLoop_Trees(TileIndex tile)
/* more than one tree, delete it */ /* more than one tree, delete it */
AddTreeCount(tile, -1); AddTreeCount(tile, -1);
SetTreeGrowth(tile, 3); SetTreeGrowth(tile, 3);
} else if (!CanPlantExtraTrees(tile)) {
/* if trees can't spread just plant a new one to prevent deforestation */
SetTreeGrowth(tile, 0);
} else { } else {
/* just one tree, change type into MP_CLEAR */ /* just one tree, change type into MP_CLEAR */
switch (GetTreeGround(tile)) { switch (GetTreeGround(tile)) {