diff options
| -rw-r--r-- | src/road_cmd.cpp | 4 | ||||
| -rw-r--r-- | src/station_cmd.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 7586a9f49..5f4e6e538 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -427,12 +427,16 @@ int32 CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) 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: diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index b863481b8..abee202b0 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1273,6 +1273,9 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) 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; |