From 63dd6ce6b0d6508ad3c07263b583b0090b2d4cba Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 28 Feb 2010 18:15:19 +0000 Subject: (svn r19291) -Codechange: Rename HasVehicleOnTunnelBridge() to TunnelBridgeIsFree() and return a CommandCost status. --- src/tunnelbridge_cmd.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/tunnelbridge_cmd.cpp') diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index fdbfc8a67..020b9f810 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -611,7 +611,9 @@ static CommandCost DoClearTunnel(TileIndex tile, DoCommandFlag flags) endtile = GetOtherTunnelEnd(tile); - if (HasVehicleOnTunnelBridge(tile, endtile)) return CMD_ERROR; + CommandCost ret = TunnelBridgeIsFree(tile, endtile); + ret.SetGlobalErrorMessage(); + if (ret.Failed()) return ret; _build_tunnel_endtile = endtile; @@ -676,7 +678,9 @@ static CommandCost DoClearBridge(TileIndex tile, DoCommandFlag flags) endtile = GetOtherBridgeEnd(tile); - if (HasVehicleOnTunnelBridge(tile, endtile)) return CMD_ERROR; + CommandCost ret = TunnelBridgeIsFree(tile, endtile); + ret.SetGlobalErrorMessage(); + if (ret.Failed()) return ret; direction = GetTunnelBridgeDirection(tile); delta = TileOffsByDiagDir(direction); -- cgit v1.2.3-54-g00ecf