diff options
| author | yexo <yexo@openttd.org> | 2010-09-05 16:33:32 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2010-09-05 16:33:32 +0000 |
| commit | a2ba35f57c8ef789760c35c64a006a14f3fb9967 (patch) | |
| tree | b0885c13b29043b71a35e218536e93b243d0c5e5 /src/waypoint_cmd.cpp | |
| parent | 0e250f2bdfc8eb7f435f59398766f7774e31610c (diff) | |
| download | openttd-a2ba35f57c8ef789760c35c64a006a14f3fb9967.tar.xz | |
(svn r20749) -Fix: allow overbuilding objects with buoys and ship depots
Diffstat (limited to 'src/waypoint_cmd.cpp')
| -rw-r--r-- | src/waypoint_cmd.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp index 9733ac951..724f193af 100644 --- a/src/waypoint_cmd.cpp +++ b/src/waypoint_cmd.cpp @@ -282,7 +282,7 @@ CommandCost CmdBuildRailWaypoint(TileIndex start_tile, DoCommandFlag flags, uint */ CommandCost CmdBuildBuoy(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { - if (!IsWaterTile(tile) || tile == 0) return_cmd_error(STR_ERROR_SITE_UNSUITABLE); + if (!HasTileWaterClass(tile) || !IsTileOnWater(tile) || tile == 0) return_cmd_error(STR_ERROR_SITE_UNSUITABLE); if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); if (GetTileSlope(tile, NULL) != SLOPE_FLAT) return_cmd_error(STR_ERROR_SITE_UNSUITABLE); @@ -291,6 +291,13 @@ CommandCost CmdBuildBuoy(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 Waypoint *wp = FindDeletedWaypointCloseTo(tile, STR_SV_STNAME_BUOY, OWNER_NONE); if (wp == NULL && !Waypoint::CanAllocateItem()) return_cmd_error(STR_ERROR_TOO_MANY_STATIONS_LOADING); + CommandCost cost(EXPENSES_CONSTRUCTION, _price[PR_BUILD_WAYPOINT_BUOY]); + if (!IsWaterTile(tile)) { + CommandCost ret = DoCommand(tile, 0, 0, flags | DC_AUTO, CMD_LANDSCAPE_CLEAR); + if (ret.Failed()) return ret; + cost.AddCost(ret); + } + if (flags & DC_EXEC) { if (wp == NULL) { wp = new Waypoint(tile); @@ -316,7 +323,7 @@ CommandCost CmdBuildBuoy(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 InvalidateWindowData(WC_WAYPOINT_VIEW, wp->index); } - return CommandCost(EXPENSES_CONSTRUCTION, _price[PR_BUILD_WAYPOINT_BUOY]); + return cost; } /** |