Disallow comparison of Bitfields

Flamefire · Flamefire · commit 2b80a44895de · 2026-02-21T17:37:50.000+01:00
diff --git a/external/libutil b/external/libutil
@@ -1 +1 @@
-Subproject commit 7198609c21eae58c31cee5e88c76dc3eddea603f
+Subproject commit 939b4c25fcea590e24e0f4a5ea14cd746f934f5d
diff --git a/libs/s25main/ingameWindows/iwAddons.cpp b/libs/s25main/ingameWindows/iwAddons.cpp
@@ -148,7 +148,7 @@ void iwAddons::UpdateView(const AddonGroup selection)
     for(unsigned i = 0; i < ggs.getNumAddons(); ++i)
     {
         const Addon* addon = ggs.getAddon(i);
-        const bool isVisible = (addon->getGroups() & selection) != AddonGroup(0);
+        const bool isVisible = bitset::any(addon->getGroups(), selection);
         auto* group = GetCtrl<ctrlGroup>(ID_grpAddonsStart + i);
 
         // Don't show addon's gui if addon is beyond selected group or is beyond current page scope

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ void iwAddons::UpdateView(const AddonGroup selection)`
`148`	`148`	`for(unsigned i = 0; i < ggs.getNumAddons(); ++i)`
`149`	`149`	`{`
`150`	`150`	`const Addon* addon = ggs.getAddon(i);`
`151`		`- const bool isVisible = (addon->getGroups() & selection) != AddonGroup(0);`
	`151`	`+ const bool isVisible = bitset::any(addon->getGroups(), selection);`
`152`	`152`	`auto* group = GetCtrl<ctrlGroup>(ID_grpAddonsStart + i);`
`153`	`153`
`154`	`154`	`// Don't show addon's gui if addon is beyond selected group or is beyond current page scope`