diff options
| author | alberth <alberth@openttd.org> | 2010-02-27 14:17:33 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2010-02-27 14:17:33 +0000 |
| commit | b8f811c7ffb2eae25c4c7ba4998dc6ab36f38382 (patch) | |
| tree | a5318ed289458a515c28c768a04f6df7f62b52d9 /src/waypoint_cmd.cpp | |
| parent | fee81aedcb36ea7d34596d692d5a613379bfc0e6 (diff) | |
| download | openttd-b8f811c7ffb2eae25c4c7ba4998dc6ab36f38382.tar.xz | |
(svn r19275) -Codechange: CanExpandRailStation() returns a CommandCost.
Diffstat (limited to 'src/waypoint_cmd.cpp')
| -rw-r--r-- | src/waypoint_cmd.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp index 348ac5d12..413d7be66 100644 --- a/src/waypoint_cmd.cpp +++ b/src/waypoint_cmd.cpp @@ -194,7 +194,7 @@ static CommandCost IsValidTileForWaypoint(TileIndex tile, Axis axis, StationID * extern void GetStationLayout(byte *layout, int numtracks, int plat_len, const StationSpec *statspec); extern CommandCost FindJoiningWaypoint(StationID existing_station, StationID station_to_join, bool adjacent, TileArea ta, Waypoint **wp); -extern bool CanExpandRailStation(const BaseStation *st, TileArea &new_ta, Axis axis); +extern CommandCost CanExpandRailStation(const BaseStation *st, TileArea &new_ta, Axis axis); /** Convert existing rail to waypoint. Eg build a waypoint station over * piece of rail @@ -265,7 +265,10 @@ CommandCost CmdBuildRailWaypoint(TileIndex start_tile, DoCommandFlag flags, uint if (wp->owner != _current_company) return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT); /* check if we want to expand an already existing waypoint? */ - if (wp->train_station.tile != INVALID_TILE && !CanExpandRailStation(wp, new_location, axis)) return CMD_ERROR; + if (wp->train_station.tile != INVALID_TILE) { + CommandCost ret = CanExpandRailStation(wp, new_location, axis); + if (ret.Failed()) return ret; + } if (!wp->rect.BeforeAddRect(start_tile, width, height, StationRect::ADD_TEST)) return CMD_ERROR; } else { |