mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-06 03:52:37 +01:00
Code Issues Releases Wiki Activity

Codechange: Initialise rail/road types with range-for.

Browse Source 
Replace double loop with single loop that performs both parts together.
This commit is contained in:
Peter Nelson
2025-09-09 21:14:17 +01:00
committed by Peter Nelson
parent ca8fb69ffd
commit 29136350cf
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rail_cmd.cpp
View File

@@ -129,15 +129,14 @@ static bool CompareRailTypes(const RailType &first, const RailType &second)
*/
void InitRailTypes()
{
for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
RailTypeInfo *rti = &_railtypes[rt];
ResolveRailTypeGUISprites(rti);
if (rti->flags.Test(RailTypeFlag::Hidden)) _railtypes_hidden_mask.Set(rt);
}
_sorted_railtypes.clear();
for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
if (_railtypes[rt].label == 0) continue;
for (RailTypeInfo &rti : _railtypes) {
RailType rt = rti.Index();
ResolveRailTypeGUISprites(&rti);
_railtypes_hidden_mask.Set(rt, rti.flags.Test(RailTypeFlag::Hidden));
if (rti.label == 0) continue;
_sorted_railtypes.push_back(rt);
}
std::sort(_sorted_railtypes.begin(), _sorted_railtypes.end(), CompareRailTypes);

15
src/road_cmd.cpp
View File

@@ -110,15 +110,14 @@ static bool CompareRoadTypes(const RoadType &first, const RoadType &second)
*/
void InitRoadTypes()
{
for (RoadType rt = ROADTYPE_BEGIN; rt != ROADTYPE_END; rt++) {
RoadTypeInfo *rti = &_roadtypes[rt];
ResolveRoadTypeGUISprites(rti);
if (rti->flags.Test(RoadTypeFlag::Hidden)) _roadtypes_hidden_mask.Set(rt);
}
_sorted_roadtypes.clear();
for (RoadType rt = ROADTYPE_BEGIN; rt != ROADTYPE_END; rt++) {
if (_roadtypes[rt].label == 0) continue;
for (RoadTypeInfo &rti : _roadtypes) {
RoadType rt = rti.Index();
ResolveRoadTypeGUISprites(&rti);
_roadtypes_hidden_mask.Set(rt, rti.flags.Test(RoadTypeFlag::Hidden));
if (rti.label == 0) continue;
_sorted_roadtypes.push_back(rt);
}
std::sort(_sorted_roadtypes.begin(), _sorted_roadtypes.end(), CompareRoadTypes);