|
|
@ -1902,8 +1902,7 @@ struct CompanyInfrastructureWindow : Window
|
|
|
|
|
|
|
|
|
|
|
|
size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT).width);
|
|
|
|
size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT).width);
|
|
|
|
|
|
|
|
|
|
|
|
RailType rt;
|
|
|
|
for (const auto &rt : _sorted_railtypes) {
|
|
|
|
FOR_ALL_SORTED_RAILTYPES(rt) {
|
|
|
|
|
|
|
|
if (HasBit(this->railtypes, rt)) {
|
|
|
|
if (HasBit(this->railtypes, rt)) {
|
|
|
|
lines++;
|
|
|
|
lines++;
|
|
|
|
SetDParam(0, GetRailTypeInfo(rt)->strings.name);
|
|
|
|
SetDParam(0, GetRailTypeInfo(rt)->strings.name);
|
|
|
@ -2035,8 +2034,7 @@ struct CompanyInfrastructureWindow : Window
|
|
|
|
|
|
|
|
|
|
|
|
if (this->railtypes != RAILTYPES_NONE) {
|
|
|
|
if (this->railtypes != RAILTYPES_NONE) {
|
|
|
|
/* Draw name of each valid railtype. */
|
|
|
|
/* Draw name of each valid railtype. */
|
|
|
|
RailType rt;
|
|
|
|
for (const auto &rt : _sorted_railtypes) {
|
|
|
|
FOR_ALL_SORTED_RAILTYPES(rt) {
|
|
|
|
|
|
|
|
if (HasBit(this->railtypes, rt)) {
|
|
|
|
if (HasBit(this->railtypes, rt)) {
|
|
|
|
SetDParam(0, GetRailTypeInfo(rt)->strings.name);
|
|
|
|
SetDParam(0, GetRailTypeInfo(rt)->strings.name);
|
|
|
|
DrawString(r.left + offs_left, r.right - offs_right, y += FONT_HEIGHT_NORMAL, STR_WHITE_STRING);
|
|
|
|
DrawString(r.left + offs_left, r.right - offs_right, y += FONT_HEIGHT_NORMAL, STR_WHITE_STRING);
|
|
|
@ -2053,8 +2051,7 @@ struct CompanyInfrastructureWindow : Window
|
|
|
|
case WID_CI_RAIL_COUNT: {
|
|
|
|
case WID_CI_RAIL_COUNT: {
|
|
|
|
/* Draw infrastructure count for each valid railtype. */
|
|
|
|
/* Draw infrastructure count for each valid railtype. */
|
|
|
|
uint32 rail_total = c->infrastructure.GetRailTotal();
|
|
|
|
uint32 rail_total = c->infrastructure.GetRailTotal();
|
|
|
|
RailType rt;
|
|
|
|
for (const auto &rt : _sorted_railtypes) {
|
|
|
|
FOR_ALL_SORTED_RAILTYPES(rt) {
|
|
|
|
|
|
|
|
if (HasBit(this->railtypes, rt)) {
|
|
|
|
if (HasBit(this->railtypes, rt)) {
|
|
|
|
this->DrawCountLine(r, y, c->infrastructure.rail[rt], RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
|
|
|
|
this->DrawCountLine(r, y, c->infrastructure.rail[rt], RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
|
|
|
|
}
|
|
|
|
}
|
|
|
|