From 7038cd8a4da27c4ad34f1d0d5de83f835a06e724 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Fri, 7 Mar 2025 22:52:15 +0100
Subject: [PATCH] Extend FlagHolder methods

---
 src/openrct2/core/FlagHolder.hpp | 44 ++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/core/FlagHolder.hpp b/src/openrct2/core/FlagHolder.hpp
index 5e2fee481d..e41305563d 100644
--- a/src/openrct2/core/FlagHolder.hpp
+++ b/src/openrct2/core/FlagHolder.hpp
@@ -16,6 +16,14 @@ struct FlagHolder
 {
     THolderType holder{};
 
+    FlagHolder() = default;
+
+    template<typename... TTypes>
+    FlagHolder(TTypes... types)
+        : holder(EnumsToFlags(types...))
+    {
+    }
+
     constexpr void clearAll()
     {
         holder = 0;
@@ -31,9 +39,35 @@ struct FlagHolder
         return (holder & EnumToFlag(flag)) != 0;
     }
 
-    constexpr void set(TEnumType flag)
+    template<typename... TTypes>
+    [[nodiscard]] constexpr bool hasAny(TTypes... types) const
     {
-        holder |= EnumToFlag(flag);
+        return (holder & EnumsToFlags(types...)) != 0;
+    }
+
+    template<typename... TTypes>
+    [[nodiscard]] constexpr bool hasAll(TTypes... types) const
+    {
+        return (holder & EnumsToFlags(types...)) == EnumsToFlags(types...);
+    }
+
+    template<typename... TTypes>
+    constexpr void set(TTypes... types)
+    {
+        holder |= EnumsToFlags(types...);
+    }
+
+    /**
+     * For situations where you don’t know upfront whether to set or unset the flag,
+     * e.g. in game actions where this is passed as a variable.
+     * Otherwise, use set/unset, which are slightly more efficient.
+     */
+    constexpr void set(TEnumType flag, bool on)
+    {
+        if (on)
+            set(flag);
+        else
+            unset(flag);
     }
 
     constexpr void unset(TEnumType flag)
@@ -41,6 +75,12 @@ struct FlagHolder
         holder &= ~EnumToFlag(flag);
     }
 
+    template<typename... TTypes>
+    constexpr void unset(TTypes... types)
+    {
+        holder &= ~EnumsToFlags(types...);
+    }
+
     constexpr void flip(TEnumType flag)
     {
         holder ^= EnumToFlag(flag);