Mercurial > hg > openttd
changeset 4157:b0e2004122f9 draft
(svn r5581) Slightly alter some snow line related calculations to make them a bit clearer
author | tron <tron@openttd.org> |
---|---|
date | Sat, 22 Jul 2006 07:36:01 +0000 |
parents | bb7de74c82d4 |
children | d85be5d5df04 |
files | clear_cmd.c tree_cmd.c |
diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/clear_cmd.c +++ b/clear_cmd.c @@ -595,17 +595,16 @@ /* convert into snowy tiles */ static void TileLoopClearAlps(TileIndex tile) { - /* distance from snow line, in steps of 8 */ - int k = GetTileZ(tile) - _opt.snow_line; + int k = GetTileZ(tile) - _opt.snow_line + TILE_HEIGHT; - if (k < -TILE_HEIGHT) { // well below the snow line + if (k < 0) { // well below the snow line if (!IsClearGround(tile, CLEAR_SNOW)) return; if (GetClearDensity(tile) == 0) SetClearGroundDensity(tile, CLEAR_GRASS, 3); } else { if (!IsClearGround(tile, CLEAR_SNOW)) { SetClearGroundDensity(tile, CLEAR_SNOW, 0); } else { - uint density = min((uint)(k + TILE_HEIGHT) / TILE_HEIGHT, 3); + uint density = min((uint)k / TILE_HEIGHT, 3); if (GetClearDensity(tile) < density) { AddClearDensity(tile, 1);
--- a/tree_cmd.c +++ b/tree_cmd.c @@ -405,13 +405,13 @@ static void TileLoopTreesAlps(TileIndex tile) { - int k = GetTileZ(tile) - _opt.snow_line; + int k = GetTileZ(tile) - _opt.snow_line + TILE_HEIGHT; - if (k < -TILE_HEIGHT) { + if (k < 0) { if (GetTreeGround(tile) != TREE_GROUND_SNOW_DESERT) return; SetTreeGroundDensity(tile, TREE_GROUND_GRASS, 0); } else { - uint density = min((uint)(k + TILE_HEIGHT) / TILE_HEIGHT, 3); + uint density = min((uint)k / TILE_HEIGHT, 3); if (GetTreeGround(tile) != TREE_GROUND_SNOW_DESERT || GetTreeDensity(tile) != density) {