(svn r9542) -Fix(FS# 712): When checking if a vehicle is on a given tile, and you are working on the ground tile, do not take aircrafts into account, as they do not pose any danger for the construction/destruction/conversion itself. Z stuff, in other words
This commit is contained in:
@@ -637,8 +637,8 @@ static int32 DoClearBridge(TileIndex tile, uint32 flags)
|
||||
|
||||
endtile = GetOtherBridgeEnd(tile);
|
||||
|
||||
if (!EnsureNoVehicle(tile) ||
|
||||
!EnsureNoVehicle(endtile) ||
|
||||
if (!EnsureNoVehicleOnGround(tile) ||
|
||||
!EnsureNoVehicleOnGround(endtile) ||
|
||||
IsVehicleOnBridge(tile, endtile, GetBridgeHeight(tile))) {
|
||||
return CMD_ERROR;
|
||||
}
|
||||
@@ -741,8 +741,8 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, RailType totype, bool exec)
|
||||
|
||||
endtile = GetOtherBridgeEnd(tile);
|
||||
|
||||
if (!EnsureNoVehicle(tile) ||
|
||||
!EnsureNoVehicle(endtile) ||
|
||||
if (!EnsureNoVehicleOnGround(tile) ||
|
||||
!EnsureNoVehicleOnGround(endtile) ||
|
||||
IsVehicleOnBridge(tile, endtile, GetBridgeHeight(tile))) {
|
||||
return CMD_ERROR;
|
||||
}
|
||||
|
Reference in New Issue
Block a user