dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace adjustments

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-06-19 14:05:34 +01:00
parent d719b09cf0
commit 82fa6ed711
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tree_cmd.cpp
View File

@@ -39,7 +39,7 @@ enum TreePlacer {
TP_NONE, ///< No tree placer algorithm TP_NONE, ///< No tree placer algorithm
TP_ORIGINAL, ///< The original algorithm TP_ORIGINAL, ///< The original algorithm
TP_IMPROVED, ///< A 'improved' algorithm TP_IMPROVED, ///< A 'improved' algorithm
TP_PERFECT, ///< A 'best' algorithm TP_PERFECT, ///< A 'best' algorithm
}; };
/** Where to place trees while in-game? */ /** Where to place trees while in-game? */
@@ -72,7 +72,7 @@ static bool CanPlantTreesOnTile(TileIndex tile, bool allow_desert)
(GetTileZ(tile) > (_settings_game.game_creation.snow_line_height + _settings_game.construction.trees_around_snow_line_range))) { (GetTileZ(tile) > (_settings_game.game_creation.snow_line_height + _settings_game.construction.trees_around_snow_line_range))) {
return false; return false;
} }
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_WATER: case MP_WATER:
return !IsBridgeAbove(tile) && IsCoast(tile) && !IsSlopeWithOneCornerRaised(GetTileSlope(tile)); return !IsBridgeAbove(tile) && IsCoast(tile) && !IsSlopeWithOneCornerRaised(GetTileSlope(tile));
@@ -281,7 +281,7 @@ static void PlaceTreeGroups(uint num_groups)
static TileIndex FindTreePositionAtSameHeight(TileIndex tile, uint steps) static TileIndex FindTreePositionAtSameHeight(TileIndex tile, uint steps)
{ {
const auto height = GetTileZ(tile); const auto height = GetTileZ(tile);
for (uint i = 0; i < steps; i++) { for (uint i = 0; i < steps; i++) {
const uint32 r = Random(); const uint32 r = Random();
const int x = GB(r, 0, 5) - 16; const int x = GB(r, 0, 5) - 16;
@@ -359,7 +359,7 @@ int MaxTreeCount(const TileIndex tile)
int max_trees_snow_line_based = 4; int max_trees_snow_line_based = 4;
if (_settings_game.game_creation.landscape == LT_ARCTIC) { if (_settings_game.game_creation.landscape == LT_ARCTIC) {
const uint height_above_snow_line = std::max<int>(0, tile_z - _settings_game.game_creation.snow_line_height); const uint height_above_snow_line = std::max<int>(0, tile_z - _settings_game.game_creation.snow_line_height);
max_trees_snow_line_based = (height_above_snow_line < lengthof(_arctic_tree_occurance)) ? max_trees_snow_line_based = (height_above_snow_line < lengthof(_arctic_tree_occurance)) ?
(1 + (_arctic_tree_occurance[height_above_snow_line] * 4) / 255) : (1 + (_arctic_tree_occurance[height_above_snow_line] * 4) / 255) :
@@ -553,7 +553,7 @@ CommandCost CmdPlantTree(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_TREES: { case MP_TREES: {
bool grow_existing_tree_instead = false; bool grow_existing_tree_instead = false;
/* no more space for trees? */ /* no more space for trees? */
if (_settings_game.game_creation.tree_placer == TP_PERFECT) { if (_settings_game.game_creation.tree_placer == TP_PERFECT) {
if (GetTreeCount(tile) >= 4 || ((GetTreeType(tile) != TREE_CACTUS) && ((int)GetTreeCount(tile) >= MaxTreeCount(tile)))) { if (GetTreeCount(tile) >= 4 || ((GetTreeType(tile) != TREE_CACTUS) && ((int)GetTreeCount(tile) >= MaxTreeCount(tile)))) {