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/road_gui.cpp | |
| parent | 3b3d80c8efbf3310a80e0540b4436a7ded147378 (diff) | |
| download | openttd-de81afdf4bfb97a48533489101e3aa0e5eb2cb4f.tar.xz | |
Cleanup: Replace FOR_ALL_SORTED_ROADTYPES macro with range iterator.
Diffstat (limited to 'src/road_gui.cpp')
| -rw-r--r-- | src/road_gui.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 9aa195247..9cc68028d 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -1313,17 +1313,16 @@ DropDownList GetRoadTypeDropDownList(RoadTramTypes rtts, bool for_replacement, b } Dimension d = { 0, 0 }; - RoadType rt; /* Get largest icon size, to ensure text is aligned on each menu item. */ if (!for_replacement) { - FOR_ALL_SORTED_ROADTYPES(rt) { + for (const auto &rt : _sorted_roadtypes) { if (!HasBit(used_roadtypes, rt)) continue; const RoadTypeInfo *rti = GetRoadTypeInfo(rt); d = maxdim(d, GetSpriteSize(rti->gui_sprites.build_x_road)); } } - FOR_ALL_SORTED_ROADTYPES(rt) { + for (const auto &rt : _sorted_roadtypes) { /* If it's not used ever, don't show it to the user. */ if (!HasBit(used_roadtypes, rt)) continue; @@ -1365,13 +1364,12 @@ DropDownList GetScenRoadTypeDropDownList(RoadTramTypes rtts) /* If it's not used ever, don't show it to the user. */ Dimension d = { 0, 0 }; - RoadType rt; - FOR_ALL_SORTED_ROADTYPES(rt) { + for (const auto &rt : _sorted_roadtypes) { if (!HasBit(used_roadtypes, rt)) continue; const RoadTypeInfo *rti = GetRoadTypeInfo(rt); d = maxdim(d, GetSpriteSize(rti->gui_sprites.build_x_road)); } - FOR_ALL_SORTED_ROADTYPES(rt) { + for (const auto &rt : _sorted_roadtypes) { if (!HasBit(used_roadtypes, rt)) continue; const RoadTypeInfo *rti = GetRoadTypeInfo(rt); |