From 17c15fab3efc4dfc7514bf89bbd9971abb178ea4 Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 14 Jun 2006 09:52:50 +0000 Subject: (svn r5260) -Fix: It was possible to convert the railtype of a bridge while a train was on it --- tunnelbridge_cmd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index 2437915e0..067db215b 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -788,7 +788,6 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, RailType totype, bool exec) } return _price.build_rail >> 1; } else if (IsBridge(tile) && IsBridgeRamp(tile) && GetBridgeTransportType(tile) == TRANSPORT_RAIL) { - uint z = TilePixelHeight(tile) + TILE_HEIGHT; const Vehicle* v; TileIndexDiff delta; int32 cost; @@ -797,7 +796,7 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, RailType totype, bool exec) endtile = GetOtherBridgeEnd(tile); // Make sure there's no vehicle on the bridge - v = FindVehicleBetween(tile, endtile, z); + v = FindVehicleBetween(tile, endtile, GetBridgeHeightRamp(tile)); if (v != NULL) { return_cmd_error(VehicleInTheWayErrMsg(v)); } -- cgit v1.2.3-54-g00ecf