From 6b37ea7b47d19c6d0e6eb7ad264d5234fccdb969 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 27 Apr 2007 20:01:25 +0000 Subject: (svn r9726) -Fix [FS#738]: crash when destroying bridge with train partially one it. --- src/tunnelbridge_cmd.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/tunnelbridge_cmd.cpp') diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index f6131f5a1..771cb3f52 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -639,10 +639,11 @@ static int32 DoClearBridge(TileIndex tile, uint32 flags) if (!CheckAllowRemoveTunnelBridge(tile)) return CMD_ERROR; endtile = GetOtherBridgeEnd(tile); + byte bridge_height = GetBridgeHeight(tile); - if (!EnsureNoVehicleOnGround(tile) || - !EnsureNoVehicleOnGround(endtile) || - IsVehicleOnBridge(tile, endtile, GetBridgeHeight(tile))) { + if (FindVehicleOnTileZ(tile, bridge_height) != NULL || + FindVehicleOnTileZ(endtile, bridge_height) != NULL || + IsVehicleOnBridge(tile, endtile, bridge_height)) { return CMD_ERROR; } @@ -743,10 +744,11 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, RailType totype, bool exec) if (!CheckTileOwnership(tile)) return CMD_ERROR; endtile = GetOtherBridgeEnd(tile); + byte bridge_height = GetBridgeHeight(tile); - if (!EnsureNoVehicleOnGround(tile) || - !EnsureNoVehicleOnGround(endtile) || - IsVehicleOnBridge(tile, endtile, GetBridgeHeight(tile))) { + if (FindVehicleOnTileZ(tile, bridge_height) != NULL || + FindVehicleOnTileZ(endtile, bridge_height) != NULL || + IsVehicleOnBridge(tile, endtile, bridge_height)) { return CMD_ERROR; } -- cgit v1.2.3-70-g09d2