From 7fd88e57981e15cd8f2c11a2134e289dbe1b856e Mon Sep 17 00:00:00 2001
From: tron <tron@openttd.org>
Date: Wed, 7 Jun 2006 19:35:21 +0000
Subject: (svn r5155) - Remove the bridge branch merge (revision r5070)

---
 tree_cmd.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'tree_cmd.c')

diff --git a/tree_cmd.c b/tree_cmd.c
index 018835d5b..808243b14 100644
--- a/tree_cmd.c
+++ b/tree_cmd.c
@@ -2,7 +2,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "bridge_map.h"
 #include "clear_map.h"
 #include "table/strings.h"
 #include "table/sprites.h"
@@ -69,7 +68,6 @@ static void DoPlaceMoreTrees(TileIndex tile)
 
 		if (dist <= 13 &&
 				IsTileType(cur_tile, MP_CLEAR) &&
-				!IsBridgeAbove(cur_tile) &&
 				!IsClearGround(cur_tile, CLEAR_FIELDS) &&
 				!IsClearGround(cur_tile, CLEAR_ROCKS)) {
 			PlaceTree(cur_tile, r);
@@ -94,7 +92,6 @@ void PlaceTreesRandomly(void)
 		uint32 r = Random();
 		TileIndex tile = RandomTileSeed(r);
 		if (IsTileType(tile, MP_CLEAR) &&
-				!IsBridgeAbove(tile) &&
 				!IsClearGround(tile, CLEAR_FIELDS) &&
 				!IsClearGround(tile, CLEAR_ROCKS)) {
 			PlaceTree(tile, r);
@@ -108,9 +105,7 @@ void PlaceTreesRandomly(void)
 		do {
 			uint32 r = Random();
 			TileIndex tile = RandomTileSeed(r);
-			if (IsTileType(tile, MP_CLEAR) &&
-					!IsBridgeAbove(tile) &&
-					GetTropicZone(tile) == TROPICZONE_RAINFOREST) {
+			if (IsTileType(tile, MP_CLEAR) && GetTropicZone(tile) == TROPICZONE_RAINFOREST) {
 				PlaceTree(tile, r);
 			}
 		} while (--i);
@@ -180,8 +175,7 @@ int32 CmdPlantTree(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 					break;
 
 				case MP_CLEAR:
-					if (!IsTileOwner(tile, OWNER_NONE) ||
-							IsBridgeAbove(tile)) {
+					if (!IsTileOwner(tile, OWNER_NONE)) {
 						msg = STR_2804_SITE_UNSUITABLE;
 						continue;
 					}
@@ -486,7 +480,7 @@ static void TileLoop_Trees(TileIndex tile)
 
 						tile += ToTileIndexDiff(_tileloop_trees_dir[Random() & 7]);
 
-						if (!IsTileType(tile, MP_CLEAR) || IsBridgeAbove(tile)) return;
+						if (!IsTileType(tile, MP_CLEAR)) return;
 
 						switch (GetClearGround(tile)) {
 							case CLEAR_GRASS:
@@ -519,7 +513,6 @@ static void TileLoop_Trees(TileIndex tile)
 					case TREE_GROUND_ROUGH: MakeClear(tile, CLEAR_ROUGH, 3); break;
 					default: MakeClear(tile, CLEAR_SNOW, GetTreeDensity(tile)); break;
 				}
-				ClearBridgeMiddle(tile);
 			}
 			break;
 
@@ -542,7 +535,6 @@ void OnTick_Trees(void)
 	if (_opt.landscape == LT_DESERT &&
 			(r = Random(), tile = RandomTileSeed(r), GetTropicZone(tile) == TROPICZONE_RAINFOREST) &&
 			IsTileType(tile, MP_CLEAR) &&
-			!IsBridgeAbove(tile) &&
 			(ct = GetClearGround(tile), ct == CLEAR_GRASS || ct == CLEAR_ROUGH) &&
 			(tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) {
 		MakeTree(tile, tree, 0, 0, ct == CLEAR_ROUGH ? TREE_GROUND_ROUGH : TREE_GROUND_GRASS, 0);
@@ -555,7 +547,6 @@ void OnTick_Trees(void)
 	r = Random();
 	tile = TILE_MASK(r);
 	if (IsTileType(tile, MP_CLEAR) &&
-			!IsBridgeAbove(tile) &&
 			(ct = GetClearGround(tile), ct == CLEAR_GRASS || ct == CLEAR_ROUGH || ct == CLEAR_SNOW) &&
 			(tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) {
 		switch (ct) {
-- 
cgit v1.2.3-54-g00ecf