# HG changeset patch # User maedhros # Date 2007-03-14 12:56:09 # Node ID b0d6e11e8e9e49aac7d64173aa77196599dded48 # Parent 145c78f941773b35912bfa45f38e50ce1c655e64 (svn r9178) -Fix (r7573) [FS#679]: Don't allow building docks or buoys under bridges. diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1629,6 +1629,7 @@ int32 CmdBuildBuoy(TileIndex tile, uint3 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); if (!IsClearWaterTile(tile) || tile == 0) return_cmd_error(STR_304B_SITE_UNSUITABLE); + if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST); /* allocate and initialize new station */ Station *st = new Station(tile); @@ -1748,6 +1749,8 @@ int32 CmdBuildDock(TileIndex tile, uint3 if (!(flags & DC_NO_TOWN_RATING) && !CheckIfAuthorityAllows(tile)) return CMD_ERROR; + if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST); + cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); if (CmdFailed(cost)) return CMD_ERROR; @@ -1757,6 +1760,8 @@ int32 CmdBuildDock(TileIndex tile, uint3 return_cmd_error(STR_304B_SITE_UNSUITABLE); } + if (MayHaveBridgeAbove(tile_cur) && IsBridgeAbove(tile_cur)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST); + cost = DoCommand(tile_cur, 0, 0, flags, CMD_LANDSCAPE_CLEAR); if (CmdFailed(cost)) return CMD_ERROR;