mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/1.8
peter1138 2017-03-12 15:26:31 +00:00
parent afcef7faa6
commit 3109f158a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rail_cmd.cpp
View File

@ -1603,7 +1603,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
* Tunnels and bridges have special check later */ * Tunnels and bridges have special check later */
if (tt != MP_TUNNELBRIDGE) { if (tt != MP_TUNNELBRIDGE) {
if (!IsCompatibleRail(type, totype)) { if (!IsCompatibleRail(type, totype)) {
CommandCost ret = EnsureNoVehicleOnGround(tile); CommandCost ret = IsPlainRailTile(tile) ? EnsureNoTrainOnTrackBits(tile, GetTrackBits(tile)) : EnsureNoVehicleOnGround(tile);
if (ret.Failed()) { if (ret.Failed()) {
error = ret; error = ret;
continue; continue;