From f8345b3fe6f2b5a9ce2ae53106ef454b1dad8fe5 Mon Sep 17 00:00:00 2001
From: celestar <celestar@openttd.org>
Date: Thu, 20 Jan 2005 09:12:20 +0000
Subject: [PATCH] (svn r1574) -Fix [ 1105281 ] upgrade rail fails when train
 under bridge

---
 tunnelbridge_cmd.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 307ab5aeec..e6ae13b891 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -864,17 +864,25 @@ int32 DoConvertTunnelBridgeRail(uint tile, uint totype, bool exec)
 	} else if ((_map5[tile]&0xC6) == 0x80) {
 		uint starttile;
 		int32 cost;
+		uint z = TilePixelHeight(tile);
+
+		z += 8;
 
 		if (!CheckTileOwnership(tile)) return CMD_ERROR;
 
 		// railway bridge
 		starttile = tile = FindEdgesOfBridge(tile, &endtile);
 		// Make sure there's no vehicle on the bridge
-		if ((v=FindVehicleBetween(tile, endtile, 0xff)) != NULL) {
+		if ((v=FindVehicleBetween(tile, endtile, z)) != NULL) {
 			VehicleInTheWayErrMsg(v);
 			return CMD_ERROR;
 		}
 
+		if (!EnsureNoVehicle(starttile) || !EnsureNoVehicle(endtile)) {
+			_error_message = STR_8803_TRAIN_IN_THE_WAY;
+			return CMD_ERROR;
+		}
+
 		if ( (uint)(_map3_lo[tile] & 0xF) == totype) return CMD_ERROR;
 		cost = 0;
 		do {