From 2e78c24ba38872df0a77ce1bc1190e20f0a46cae Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 4 Jun 2025 07:31:44 +0100 Subject: [PATCH] Codefix: Use bitset .None() or .Any() instead of comparing against an empty bitset. (#14327) --- src/spritecache.cpp | 4 ++-- src/spriteloader/grf.cpp | 2 +- src/station.cpp | 2 +- src/station_gui.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/spritecache.cpp b/src/spritecache.cpp index 3ffff15e01..8997ef6749 100644 --- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -604,11 +604,11 @@ void ReadGRFSpriteOffsets(SpriteFile &file) if (length > 0) { uint8_t zoom = file.ReadByte(); length--; - if (colour != SpriteComponents{} && zoom == 0) { // ZoomLevel::Normal (normal zoom) + if (colour.Any() && zoom == 0) { // ZoomLevel::Normal (normal zoom) SetBit(offset.control_flags, (colour != SpriteComponent::Palette) ? SCCF_ALLOW_ZOOM_MIN_1X_32BPP : SCCF_ALLOW_ZOOM_MIN_1X_PAL); SetBit(offset.control_flags, (colour != SpriteComponent::Palette) ? SCCF_ALLOW_ZOOM_MIN_2X_32BPP : SCCF_ALLOW_ZOOM_MIN_2X_PAL); } - if (colour != SpriteComponents{} && zoom == 2) { // ZoomLevel::In2x (2x zoomed in) + if (colour.Any() && zoom == 2) { // ZoomLevel::In2x (2x zoomed in) SetBit(offset.control_flags, (colour != SpriteComponent::Palette) ? SCCF_ALLOW_ZOOM_MIN_2X_32BPP : SCCF_ALLOW_ZOOM_MIN_2X_PAL); } } diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp index ed69e63b79..57cb86a1a3 100644 --- a/src/spriteloader/grf.cpp +++ b/src/spriteloader/grf.cpp @@ -283,7 +283,7 @@ static ZoomLevels LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFil uint8_t zoom = file.ReadByte(); - bool is_wanted_colour_depth = (colour != SpriteComponents{} && (load_32bpp ? colour != SpriteComponent::Palette : colour == SpriteComponent::Palette)); + bool is_wanted_colour_depth = (colour.Any() && (load_32bpp ? colour != SpriteComponent::Palette : colour == SpriteComponent::Palette)); bool is_wanted_zoom_lvl; if (sprite_type != SpriteType::MapGen) { diff --git a/src/station.cpp b/src/station.cpp index f323dff5a2..fa7b545fc3 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -229,7 +229,7 @@ RoadStop *Station::GetPrimaryRoadStop(const RoadVehicle *v) const */ void Station::AddFacility(StationFacility new_facility_bit, TileIndex facil_xy) { - if (this->facilities == StationFacilities{}) { + if (this->facilities.None()) { this->MoveSign(facil_xy); this->random_bits = Random(); } diff --git a/src/station_gui.cpp b/src/station_gui.cpp index e8601afac8..6072972c7a 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -1454,7 +1454,7 @@ struct StationViewWindow : public Window { this->SetWidgetLoweredState(WID_SV_CLOSE_AIRPORT, st->facilities.Test(StationFacility::Airport) && st->airport.blocks.Test(AirportBlock::AirportClosed)); extern const Station *_viewport_highlight_station; - this->SetWidgetDisabledState(WID_SV_CATCHMENT, st->facilities == StationFacilities{}); + this->SetWidgetDisabledState(WID_SV_CATCHMENT, st->facilities.None()); this->SetWidgetLoweredState(WID_SV_CATCHMENT, _viewport_highlight_station == st); this->DrawWidgets();