Mercurial > hg > openttd
changeset 6761:f75a2f332873 draft
(svn r9996) -Fix: be more strict when building/upgrading roads and/or road stops.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Thu, 31 May 2007 07:34:40 +0000 |
| parents | 90fd4a119369 |
| children | ab96cfc6b2e1 |
| files | src/road_cmd.cpp src/station_cmd.cpp |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -427,12 +427,16 @@ case MP_STATION: if (!IsDriveThroughStopTile(tile)) return CMD_ERROR; if (HASBIT(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT); + /* Don't allow "upgrading" the roadstop when vehicles are already driving on it */ + if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; break; case MP_TUNNELBRIDGE: if ((IsTunnel(tile) && GetTunnelTransportType(tile) != TRANSPORT_ROAD) || (IsBridge(tile) && GetBridgeTransportType(tile) != TRANSPORT_ROAD)) return CMD_ERROR; if (HASBIT(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT); + /* Don't allow "upgrading" the bridge/tunnel when vehicles are already driving on it */ + if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; break; default:
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1273,6 +1273,9 @@ if (IsTileOwner(tile, OWNER_TOWN) && !_patches.road_stop_on_town_road) return_cmd_error(STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD); if (GetRoadTileType(tile) != ROAD_TILE_NORMAL) return CMD_ERROR; + /* Don't allow building the roadstop when vehicles are already driving on it */ + if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; + RoadTypes cur_rts = GetRoadTypes(tile); if (GetRoadOwner(tile, ROADTYPE_ROAD) != OWNER_TOWN && HASBIT(cur_rts, ROADTYPE_ROAD) && !CheckOwnership(GetRoadOwner(tile, ROADTYPE_ROAD))) return CMD_ERROR; if (HASBIT(cur_rts, ROADTYPE_TRAM) && !CheckOwnership(GetRoadOwner(tile, ROADTYPE_TRAM))) return CMD_ERROR;