mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r5260) -Fix: It was possible to convert the railtype of a bridge while a train was on it

release/0.5
tron 2006-06-14 09:52:50 +00:00
parent f5638395fe
commit 17c15fab3e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tunnelbridge_cmd.c
View File

@ -788,7 +788,6 @@ 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) {
uint z = TilePixelHeight(tile) + TILE_HEIGHT;
const Vehicle* v; const Vehicle* v;
TileIndexDiff delta; TileIndexDiff delta;
int32 cost; int32 cost;
@ -797,7 +796,7 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, RailType totype, bool exec)
endtile = GetOtherBridgeEnd(tile); endtile = GetOtherBridgeEnd(tile);
// Make sure there's no vehicle on the bridge // Make sure there's no vehicle on the bridge
v = FindVehicleBetween(tile, endtile, z); v = FindVehicleBetween(tile, endtile, GetBridgeHeightRamp(tile));
if (v != NULL) { if (v != NULL) {
return_cmd_error(VehicleInTheWayErrMsg(v)); return_cmd_error(VehicleInTheWayErrMsg(v));
} }