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

(svn r1355) -Fix: [1092473] random trees in scenario editor do not overwrite rocks as well

release/0.4.5
darkvater 2005-01-03 21:47:52 +00:00
parent d922ca68e7
commit 9a49fda8e6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tree_cmd.c
View File

@ -80,8 +80,9 @@ static void DoPlaceMoreTrees(uint tile)
cur_tile = TILE_MASK(tile + TILE_XY(x,y)); cur_tile = TILE_MASK(tile + TILE_XY(x,y));
/* Only on tiles within 13 squares from tile, /* Only on tiles within 13 squares from tile,
on clear tiles, and NOT on farm-tiles */ on clear tiles, and NOT on farm-tiles or rocks */
if (dist <= 13 && IS_TILETYPE(cur_tile, MP_CLEAR) && (_map5[tile] & 0x1F) != 0x0F) { if (dist <= 13 && IS_TILETYPE(cur_tile, MP_CLEAR) &&
(_map5[cur_tile] & 0x1F) != 0x0F && (_map5[cur_tile] & 0x1C) != 8) {
PlaceTree(cur_tile, r, dist <= 6 ? 0xC0 : 0); PlaceTree(cur_tile, r, dist <= 6 ? 0xC0 : 0);
} }
} while (--i); } while (--i);
@ -105,8 +106,8 @@ void PlaceTreesRandomly()
do { do {
r = Random(); r = Random();
tile = TILE_MASK(r); tile = TILE_MASK(r);
/* Only on clear tiles, and NOT on farm-tiles */ /* Only on clear tiles, and NOT on farm-tiles or rocks */
if (IS_TILETYPE(tile, MP_CLEAR) && (_map5[tile] & 0x1F) != 0x0F) { if (IS_TILETYPE(tile, MP_CLEAR) && (_map5[tile] & 0x1F) != 0x0F && (_map5[tile] & 0x1C) != 8) {
PlaceTree(tile, r, 0); PlaceTree(tile, r, 0);
} }
} while (--i); } while (--i);