diff options
| author | smatz <smatz@openttd.org> | 2007-12-16 19:30:42 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2007-12-16 19:30:42 +0000 |
| commit | d56a690ba432c3ef483ac7a8072266349f2bfc96 (patch) | |
| tree | 3d93af5bbe577ea3e66b1184cb89c1a934d6bcda /src/road_cmd.cpp | |
| parent | cdee7d4cb8541657d99891ee59cb5caab6aaf444 (diff) | |
| download | openttd-d56a690ba432c3ef483ac7a8072266349f2bfc96.tar.xz | |
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index df4404a05..58ad42208 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -133,15 +133,8 @@ CommandCost CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) case MP_TUNNELBRIDGE: { - TileIndex endtile; - if (IsTunnel(tile)) { - if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR; - endtile = GetOtherTunnelEnd(tile); - } else { - if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR; - endtile = GetOtherBridgeEnd(tile); - } - + if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR; + TileIndex endtile = IsTunnel(tile) ? GetOtherTunnelEnd(tile) : GetOtherBridgeEnd(tile); if (GetVehicleTunnelBridge(tile, endtile) != NULL) return CMD_ERROR; } break; @@ -514,15 +507,11 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) case MP_TUNNELBRIDGE: { - TileIndex endtile; - if (IsTunnel(tile)) { - if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR; - endtile = GetOtherTunnelEnd(tile); - } else { - if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR; - endtile = GetOtherBridgeEnd(tile); - } + if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR; if (HasBit(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT); + + TileIndex endtile = IsTunnel(tile) ? GetOtherTunnelEnd(tile) : GetOtherBridgeEnd(tile); + /* Don't allow "upgrading" the bridge/tunnel when vehicles are already driving on it */ if (GetVehicleTunnelBridge(tile, endtile) != NULL) return CMD_ERROR; } break; |