diff options
| author | tron <tron@openttd.org> | 2006-06-07 19:35:21 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-06-07 19:35:21 +0000 |
| commit | 7fd88e57981e15cd8f2c11a2134e289dbe1b856e (patch) | |
| tree | 5a6fb4aa93546ad194301d231de10ba5370ccc6f /clear_cmd.c | |
| parent | 8992f9cb2bf20a1615f99735d13ade6b2535cbcf (diff) | |
| download | openttd-7fd88e57981e15cd8f2c11a2134e289dbe1b856e.tar.xz | |
(svn r5155) - Remove the bridge branch merge (revision r5070)
Diffstat (limited to 'clear_cmd.c')
| -rw-r--r-- | clear_cmd.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/clear_cmd.c b/clear_cmd.c index ca4cfa24b..259146965 100644 --- a/clear_cmd.c +++ b/clear_cmd.c @@ -11,7 +11,6 @@ #include "viewport.h" #include "command.h" #include "tunnel_map.h" -#include "bridge_map.h" #include "variables.h" #include "table/sprites.h" #include "unmovable_map.h" @@ -260,14 +259,6 @@ int32 CmdTerraformLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) } else return_cmd_error(STR_5800_OBJECT_IN_THE_WAY); } - if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) { - byte height = GetBridgeHeight(GetNorthernBridgeEnd(tile), GetBridgeAxis(tile)); - - height /= TILE_HEIGHT; - - if (a >= height || b >= height || c >= height || d >= height) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST); - } - if (direction == -1 && IsTunnelInWay(tile, min)) return_cmd_error(STR_1002_EXCAVATION_WOULD_DAMAGE); _terraform_err_tile = 0; @@ -510,7 +501,6 @@ static void DrawTile_Clear(TileInfo *ti) } DrawClearLandFence(ti); - DrawBridgeMiddle(ti); } static uint GetSlopeZ_Clear(const TileInfo* ti) |