diff options
| author | smatz <smatz@openttd.org> | 2008-02-18 22:12:27 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-02-18 22:12:27 +0000 |
| commit | b2721c08fc05911f4fa9dc6908ee2d34ec7d335a (patch) | |
| tree | a85df70806b802e743aedb136777bc98d924ac9a | |
| parent | 6c59c9d7467f309d0321093755bbd12f42bc1bda (diff) | |
| download | openttd-b2721c08fc05911f4fa9dc6908ee2d34ec7d335a.tar.xz | |
(svn r12183) -Codechange: give a better error message when building road over existing road with vehicle on it, or do not fail at all
| -rw-r--r-- | src/road_cmd.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 40d520288..5100e8f4f 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -426,7 +426,6 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) switch (GetRoadTileType(tile)) { case ROAD_TILE_NORMAL: { if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS); - if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; all_bits = GetAllRoadBits(tile); if (!HasTileRoadType(tile, rt)) break; @@ -443,6 +442,8 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (toggle_drd != DRD_NONE && rt != ROADTYPE_TRAM && GetRoadOwner(tile, ROADTYPE_ROAD) == _current_player) { if (crossing) return_cmd_error(STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION); + if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; + /* Ignore half built tiles */ if (flags & DC_EXEC && rt != ROADTYPE_TRAM && (existing == ROAD_X || existing == ROAD_Y)) { SetDisallowedRoadDirections(tile, GetDisallowedRoadDirections(tile) ^ toggle_drd); @@ -458,7 +459,6 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (HasTileRoadType(tile, rt)) return_cmd_error(STR_1007_ALREADY_BUILT); all_bits = GetCrossingRoadBits(tile); if (pieces & ComplementRoadBits(all_bits)) goto do_clear; - if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; break; default: @@ -509,8 +509,6 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) case MP_STATION: if (!IsDriveThroughStopTile(tile)) return CMD_ERROR; if (HasTileRoadType(tile, rt)) return_cmd_error(STR_1007_ALREADY_BUILT); - /* Don't allow adding roadtype to the roadstop when vehicles are already driving on it */ - if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; break; case MP_TUNNELBRIDGE: @@ -560,6 +558,8 @@ do_clear:; } } + if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; + cost.AddCost(CountBits(pieces) * _price.build_road); if (IsTileType(tile, MP_TUNNELBRIDGE)) { /* Pay for *every* tile of the bridge or tunnel */ @@ -634,6 +634,8 @@ CommandCost CmdBuildLongRoad(TileIndex end_tile, uint32 flags, uint32 p1, uint32 bool had_success = false; DisallowedRoadDirections drd = DRD_NORTHBOUND; + _error_message = INVALID_STRING_ID; + if (p1 >= MapSize()) return CMD_ERROR; start_tile = p1; @@ -671,7 +673,6 @@ CommandCost CmdBuildLongRoad(TileIndex end_tile, uint32 flags, uint32 p1, uint32 ret = DoCommand(tile, drd << 6 | rt << 4 | bits, 0, flags, CMD_BUILD_ROAD); if (CmdFailed(ret)) { if (_error_message != STR_1007_ALREADY_BUILT) return CMD_ERROR; - _error_message = INVALID_STRING_ID; } else { had_success = true; /* Only pay for the upgrade on one side of the bridges and tunnels */ |