From ee664f7e8c2ce3e9b398e00f680f5d35bf1bd8e7 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Fri, 12 Sep 2025 19:37:17 +0100 Subject: [PATCH] Codechange: Prefer EnumBitSet's All() method over bitwise comparisons. (#14611) This makes the intent of the operation clearer. --- src/rail.cpp | 2 +- src/road.cpp | 2 +- src/townname.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rail.cpp b/src/rail.cpp index e09f1b4e20..5e6682317d 100644 --- a/src/rail.cpp +++ b/src/rail.cpp @@ -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); } diff --git a/src/road.cpp b/src/road.cpp index f80fdddf4c..27a6a9bb78 100644 --- a/src/road.cpp +++ b/src/road.cpp @@ -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); } diff --git a/src/townname.cpp b/src/townname.cpp index aa264a6dba..5067de1524 100644 --- a/src/townname.cpp +++ b/src/townname.cpp @@ -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; }