cpp/openttd-patchpack/source Changeset - r22573:9e47bd34f5f9

Changeset - r22573:9e47bd34f5f9

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 8 years ago 2017-03-12 15:26:31
peter1138@openttd.org

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

1 file changed with 1 insertions and 1 deletions:

src/rail_cmd.cpp

0 comments (0 inline, 0 general)

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -1600,13 +1600,13 @@ CommandCost CmdConvertRail(TileIndex til @@
 		SmallVector<Train *, 2> vehicles_affected;
 		/* Vehicle on the tile when not converting Rail <-> ElRail
 		 * 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;
+				}
+			}
 			if (flags & DC_EXEC) { // we can safely convert, too

0 comments (0 inline, 0 general)