Cleanup: Replace FOR_ALL_SORTED_ROADTYPES macro with range iterator.

(cherry picked from commit de81afdf4b)
This commit is contained in:
Peter Nelson
2021-04-28 21:50:23 +01:00
committed by Jonathan G Rennison
parent 571f807b20
commit 5e1b4e1844
3 changed files with 7 additions and 18 deletions

View File

@@ -1391,17 +1391,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;
@@ -1443,13 +1442,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);