diff options
author | peter1138 <peter1138@openttd.org> | 2017-03-12 15:26:31 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2017-03-12 15:26:31 +0000 |
commit | 3109f158a6f413895afe4409cd3016d6cf82787a (patch) | |
tree | ce9ed2079c52008ab0b54121dbc5c6700c7d0dd6 | |
parent | afcef7faa6d3ccfcbf3e46d74c9ae5120d268efc (diff) | |
download | openttd-3109f158a6f413895afe4409cd3016d6cf82787a.tar.xz |
(svn r27784) -Fix [FS#6505]: Allow rail conversion even if ship is on tile (Samu).
-rw-r--r-- | src/rail_cmd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index a5face14c..5582666b1 100644 --- 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; |