(svn r27784) -Fix [FS#6505]: Allow rail conversion even if ship is on tile (Samu).

7 years ago · 7501b7cf7a
parent ed63b48e76
commit 7501b7cf7a
1 changed files with 1 additions and 1 deletions
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@ -1603,7 +1603,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 		 * Tunnels and bridges have special check later */
 		if (tt != MP_TUNNELBRIDGE) {
 			if (!IsCompatibleRail(type, totype)) {
-				CommandCost ret = EnsureNoVehicleOnGround(tile);
+				CommandCost ret = IsPlainRailTile(tile) ? EnsureNoTrainOnTrackBits(tile, GetTrackBits(tile)) : EnsureNoVehicleOnGround(tile);
 				if (ret.Failed()) {
 					error = ret;
 					continue;