use range check for physical enum

legacyclonk · Sep 17, 2024 · e8f76c4 · e8f76c4
1 parent 624101e
commit e8f76c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/C4HudBars.cpp b/src/C4HudBars.cpp
@@ -610,7 +610,7 @@ void C4HudBarsUniquifier::ProcessHudBar(std::int32_t &valueIndex, const C4HudBar
 
 	C4Value physical{bar[C4VString("physical")]};
 	auto _physical = static_cast<C4HudBarDef::Physical>(physical.getInt());
-	if (_physical & ~C4HudBarDef::EBP_All) error("physical", physical);
+	if (C4HudBarDef::EBP_First <= _physical && _physical <= C4HudBarDef::EBP_Last) error("physical", physical);
 
 	C4Value hide{bar[C4VString("hide")]};
 	auto _hide = C4HudBarDef::EBH_Empty;

diff --git a/src/C4HudBars.h b/src/C4HudBars.h
@@ -45,7 +45,8 @@ class C4HudBarDef
 		EBP_Energy = 1,
 		EBP_Magic = 2,
 		EBP_Breath = 3,
-		EBP_All = EBP_Energy | EBP_Magic | EBP_Breath
+		EBP_First = EBP_None,
+		EBP_Last = EBP_Breath
 	};
 
 	enum Hide