|
|
|
@ -1578,6 +1578,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
|
|
|
|
|
|
|
|
|
|
CommandCost cost(EXPENSES_CONSTRUCTION);
|
|
|
|
|
CommandCost error = CommandCost(STR_ERROR_NO_SUITABLE_RAILROAD_TRACK); // by default, there is no track to convert.
|
|
|
|
|
bool found_convertible_track = false; // whether we actually did convert some track (see bug #7633)
|
|
|
|
|
|
|
|
|
|
TileIterator *iter = diagonal ? (TileIterator *)new DiagonalTileIterator(area_start, area_end) : new OrthogonalTileIterator(area_start, area_end);
|
|
|
|
|
for (; (tile = *iter) != INVALID_TILE; ++(*iter)) {
|
|
|
|
@ -1673,6 +1674,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
|
|
|
|
|
InvalidateWindowData(WC_VEHICLE_DEPOT, tile);
|
|
|
|
|
InvalidateWindowData(WC_BUILD_VEHICLE, tile);
|
|
|
|
|
}
|
|
|
|
|
found_convertible_track = true;
|
|
|
|
|
cost.AddCost(RailConvertCost(type, totype));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
@ -1684,6 +1686,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
|
|
|
|
|
YapfNotifyTrackLayoutChange(tile, RemoveFirstTrack(&tracks));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
found_convertible_track = true;
|
|
|
|
|
cost.AddCost(RailConvertCost(type, totype) * CountBits(GetTrackBits(tile)));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
@ -1746,6 +1749,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
found_convertible_track = true;
|
|
|
|
|
cost.AddCost((GetTunnelBridgeLength(tile, endtile) + 2) * RailConvertCost(type, totype));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
@ -1756,6 +1760,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
|
|
|
|
|
YapfNotifyTrackLayoutChange(tile, track);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
found_convertible_track = true;
|
|
|
|
|
cost.AddCost(RailConvertCost(type, totype));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
@ -1773,7 +1778,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
delete iter;
|
|
|
|
|
return (cost.GetCost() == 0) ? error : cost;
|
|
|
|
|
return found_convertible_track ? cost : error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static CommandCost RemoveTrainDepot(TileIndex tile, DoCommandFlag flags)
|
|
|
|
|