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: Prefer EnumBitSet's All() method over bitwise comparisons. (#14611)

Browse Source 
This makes the intent of the operation clearer.
This commit is contained in:
Peter Nelson
2025-09-12 19:37:17 +01:00
committed by GitHub
parent b1dc37fb05
commit ee664f7e8c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rail.cpp
View File

@@ -104,7 +104,7 @@ RailTypes AddDateIntroducedRailTypes(RailTypes current, TimerGameCalendar::Date
/* Have we introduced all required railtypes? */
RailTypes required = rti->introduction_required_railtypes;
if ((rts & required) != required) continue;
if (!rts.All(required)) continue;
rts.Set(rti->introduces_railtypes);
}

2
src/road.cpp
View File

@@ -179,7 +179,7 @@ RoadTypes AddDateIntroducedRoadTypes(RoadTypes current, TimerGameCalendar::Date
/* Have we introduced all required roadtypes? */
RoadTypes required = rti->introduction_required_roadtypes;
if ((rts & required) != required) continue;
if (!rts.All(required)) continue;
rts.Set(rti->introduces_roadtypes);
}

4
src/townname.cpp
View File

@@ -667,7 +667,7 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
for (ending = ending_start; ending <= ending_stop; ending++) {
const CzechNameSubst *e = &_name_czech_subst_ending[ending];
if ((e->choose & choose) == choose && e->allow.Any(allow)) {
if (e->choose.All(choose) && e->allow.Any(allow)) {
map[i++] = ending;
}
}
@@ -681,7 +681,7 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
assert(gender != CZG_FREE && gender != CZG_NFREE);
}
if (do_prefix && (_name_czech_adj[prefix].choose & choose) != choose) {
if (do_prefix && !_name_czech_adj[prefix].choose.All(choose)) {
/* Throw away non-matching prefix. */
do_prefix = false;
}