diff options
| author | Peter Nelson <peter1138@openttd.org> | 2021-04-28 21:50:23 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2021-04-28 23:54:31 +0100 |
| commit | de81afdf4bfb97a48533489101e3aa0e5eb2cb4f (patch) | |
| tree | 7c99c0beeb67a63e0a5472431802f00b98dafcf9 /src/company_gui.cpp | |
| parent | 3b3d80c8efbf3310a80e0540b4436a7ded147378 (diff) | |
| download | openttd-de81afdf4bfb97a48533489101e3aa0e5eb2cb4f.tar.xz | |
Cleanup: Replace FOR_ALL_SORTED_ROADTYPES macro with range iterator.
Diffstat (limited to 'src/company_gui.cpp')
| -rw-r--r-- | src/company_gui.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 3706db2f5..f9eceba17 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -1862,8 +1862,7 @@ struct CompanyInfrastructureWindow : Window size->width = std::max(size->width, GetStringBoundingBox(widget == WID_CI_ROAD_DESC ? STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT : STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT).width); - RoadType rt; - FOR_ALL_SORTED_ROADTYPES(rt) { + for (const auto &rt : _sorted_roadtypes) { if (HasBit(this->roadtypes, rt) && RoadTypeIsRoad(rt) == (widget == WID_CI_ROAD_DESC)) { lines++; SetDParam(0, GetRoadTypeInfo(rt)->strings.name); @@ -2005,8 +2004,7 @@ struct CompanyInfrastructureWindow : Window DrawString(r.left, r.right, y, widget == WID_CI_ROAD_DESC ? STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT : STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT); /* Draw name of each valid roadtype. */ - RoadType rt; - FOR_ALL_SORTED_ROADTYPES(rt) { + for (const auto &rt : _sorted_roadtypes) { if (HasBit(this->roadtypes, rt) && RoadTypeIsRoad(rt) == (widget == WID_CI_ROAD_DESC)) { SetDParam(0, GetRoadTypeInfo(rt)->strings.name); DrawString(r.left + offs_left, r.right - offs_right, y += FONT_HEIGHT_NORMAL, STR_WHITE_STRING); @@ -2019,8 +2017,7 @@ struct CompanyInfrastructureWindow : Window case WID_CI_ROAD_COUNT: case WID_CI_TRAM_COUNT: { uint32 road_tram_total = widget == WID_CI_ROAD_COUNT ? c->infrastructure.GetRoadTotal() : c->infrastructure.GetTramTotal(); - RoadType rt; - FOR_ALL_SORTED_ROADTYPES(rt) { + for (const auto &rt : _sorted_roadtypes) { if (HasBit(this->roadtypes, rt) && RoadTypeIsRoad(rt) == (widget == WID_CI_ROAD_COUNT)) { this->DrawCountLine(r, y, c->infrastructure.road[rt], RoadMaintenanceCost(rt, c->infrastructure.road[rt], road_tram_total)); } |