dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r5610) Remove a pointless call to VehicleInTheWayErrMsg() - only trains can be on rail bridges

Browse Source
This commit is contained in:
tron
2006-07-26 05:57:30 +00:00
parent 6082507fea
commit ec109a8e8f
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tunnelbridge_cmd.c
View File

@@ -792,20 +792,16 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, RailType totype, bool exec)
} }
return _price.build_rail >> 1; return _price.build_rail >> 1;
} else if (IsBridge(tile) && IsBridgeRamp(tile) && GetBridgeTransportType(tile) == TRANSPORT_RAIL) { } else if (IsBridge(tile) && IsBridgeRamp(tile) && GetBridgeTransportType(tile) == TRANSPORT_RAIL) {
const Vehicle* v;
TileIndexDiff delta; TileIndexDiff delta;
int32 cost; int32 cost;
if (!CheckTileOwnership(tile)) return CMD_ERROR; if (!CheckTileOwnership(tile)) return CMD_ERROR;
endtile = GetOtherBridgeEnd(tile); endtile = GetOtherBridgeEnd(tile);
// Make sure there's no vehicle on the bridge
v = FindVehicleBetween(tile, endtile, GetBridgeHeightRamp(tile));
if (v != NULL) {
return_cmd_error(VehicleInTheWayErrMsg(v));
}
if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(endtile)) { if (!EnsureNoVehicle(tile) ||
!EnsureNoVehicle(endtile) ||
FindVehicleBetween(tile, endtile, GetBridgeHeightRamp(tile)) != NULL) {
return_cmd_error(STR_8803_TRAIN_IN_THE_WAY); return_cmd_error(STR_8803_TRAIN_IN_THE_WAY);
} }