diff options
| author | alberth <alberth@openttd.org> | 2010-02-28 18:15:19 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2010-02-28 18:15:19 +0000 |
| commit | 63dd6ce6b0d6508ad3c07263b583b0090b2d4cba (patch) | |
| tree | 4d49d60b5c90925642ee3309054c5f22836ade02 /src/road_cmd.cpp | |
| parent | 986d15ef73106270701616373b778e0332e40555 (diff) | |
| download | openttd-63dd6ce6b0d6508ad3c07263b583b0090b2d4cba.tar.xz | |
(svn r19291) -Codechange: Rename HasVehicleOnTunnelBridge() to TunnelBridgeIsFree() and return a CommandCost status.
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 9e9f9c141..7ee64c795 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -192,10 +192,12 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; break; - case MP_TUNNELBRIDGE: + case MP_TUNNELBRIDGE: { if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR; - if (HasVehicleOnTunnelBridge(tile, GetOtherTunnelBridgeEnd(tile))) return CMD_ERROR; - break; + CommandCost ret = TunnelBridgeIsFree(tile, GetOtherTunnelBridgeEnd(tile)); + ret.SetGlobalErrorMessage(); + if (ret.Failed()) return ret; + } break; default: return CMD_ERROR; @@ -573,13 +575,15 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 if (HasTileRoadType(tile, rt)) return_cmd_error(STR_ERROR_ALREADY_BUILT); } break; - case MP_TUNNELBRIDGE: + case MP_TUNNELBRIDGE: { if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) goto do_clear; if (MirrorRoadBits(DiagDirToRoadBits(GetTunnelBridgeDirection(tile))) != pieces) goto do_clear; if (HasTileRoadType(tile, rt)) return_cmd_error(STR_ERROR_ALREADY_BUILT); /* Don't allow adding roadtype to the bridge/tunnel when vehicles are already driving on it */ - if (HasVehicleOnTunnelBridge(tile, GetOtherTunnelBridgeEnd(tile))) return CMD_ERROR; - break; + CommandCost ret = TunnelBridgeIsFree(tile, GetOtherTunnelBridgeEnd(tile)); + ret.SetGlobalErrorMessage(); + if (ret.Failed()) return ret; + } break; default: { do_clear:; |