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 | be88e269b918b365695e84cfa962e8d21b98e759 (patch) | |
| tree | 5a6fb4aa93546ad194301d231de10ba5370ccc6f /town_cmd.c | |
| parent | ace071529e2116f92aeec50d3bac0f95953b129b (diff) | |
| download | openttd-be88e269b918b365695e84cfa962e8d21b98e759.tar.xz | |
(svn r5155) - Remove the bridge branch merge (revision r5070)
Diffstat (limited to 'town_cmd.c')
| -rw-r--r-- | town_cmd.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/town_cmd.c b/town_cmd.c index 590641406..2c7a8653c 100644 --- a/town_cmd.c +++ b/town_cmd.c @@ -26,7 +26,6 @@ #include "water_map.h" #include "variables.h" #include "bridge.h" -#include "bridge_map.h" #include "table/town_land.h" enum { @@ -1094,8 +1093,6 @@ static bool CheckBuildHouseMode(TileIndex tile, Slope tileh, int mode) slope = GetTileSlope(tile, NULL); if (IsSteepSlope(slope)) return false; - if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return false; - b = 0; if ((slope != SLOPE_FLAT && ~slope & _masks[mode])) b = ~b; if ((tileh != SLOPE_FLAT && ~tileh & _masks[mode+4])) b = ~b; @@ -1139,8 +1136,6 @@ static bool CheckFree2x2Area(TileIndex tile) if (GetTileSlope(tile, NULL) != SLOPE_FLAT) return false; - if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return false; - if (CmdFailed(DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER | DC_FORCETEST, CMD_LANDSCAPE_CLEAR))) return false; } @@ -1275,7 +1270,6 @@ static bool BuildTownHouse(Town *t, TileIndex tile) // make sure it's possible if (!EnsureNoVehicle(tile)) return false; if (IsSteepSlope(GetTileSlope(tile, NULL))) return false; - if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return false; r = DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_LANDSCAPE_CLEAR); if (CmdFailed(r)) return false; |