Fix model glow not being removed when toggling off the master switch

danielkrupinski · Dec 31, 2024 · d434e40 · d434e40
1 parent e123cb9
commit d434e40
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/Source/Features/Visuals/ModelGlow/DefuseKitModelGlow/DefuseKitModelGlow.h b/Source/Features/Visuals/ModelGlow/DefuseKitModelGlow/DefuseKitModelGlow.h
@@ -43,7 +43,7 @@ class DefuseKitModelGlow {
 
     [[nodiscard]] bool isEnabled() const noexcept
     {
-        return state().defuseKitModelGlow == ModelGlowState::State::Enabled;
+        return state().masterSwitch == ModelGlowState::State::Enabled && state().defuseKitModelGlow == ModelGlowState::State::Enabled;
     }
 
     [[nodiscard]] auto& state() const noexcept

diff --git a/Source/Features/Visuals/ModelGlow/DroppedBombModelGlow/DroppedBombModelGlow.h b/Source/Features/Visuals/ModelGlow/DroppedBombModelGlow/DroppedBombModelGlow.h
@@ -85,7 +85,7 @@ class DroppedBombModelGlow {
 
     [[nodiscard]] bool shouldGlowBombModel(auto&& bomb) const noexcept
     {
-        return !bomb.baseWeapon().baseEntity().hasOwner().valueOr(true);
+        return state().masterSwitch == ModelGlowState::State::Enabled && !bomb.baseWeapon().baseEntity().hasOwner().valueOr(true);
     }
 
     [[nodiscard]] auto& state() const noexcept

diff --git a/Source/Features/Visuals/ModelGlow/GrenadeProjectileModelGlow/GrenadeProjectileModelGlow.h b/Source/Features/Visuals/ModelGlow/GrenadeProjectileModelGlow/GrenadeProjectileModelGlow.h
@@ -43,7 +43,7 @@ class GrenadeProjectileModelGlow {
 
     [[nodiscard]] bool isEnabled() const noexcept
     {
-        return state().grenadeProjectileModelGlow == ModelGlowState::State::Enabled;
+        return state().masterSwitch == ModelGlowState::State::Enabled && state().grenadeProjectileModelGlow == ModelGlowState::State::Enabled;
     }
 
     [[nodiscard]] auto& state() const noexcept

diff --git a/Source/Features/Visuals/ModelGlow/PlayerModelGlow/PlayerModelGlow.h b/Source/Features/Visuals/ModelGlow/PlayerModelGlow/PlayerModelGlow.h
@@ -84,7 +84,8 @@ class PlayerModelGlow {
 
     [[nodiscard]] bool shouldGlowPlayerModel(auto&& playerPawn) const noexcept
     {
-        return playerPawn.isAlive().value_or(true)
+        return state().masterSwitch == ModelGlowState::State::Enabled
+            && playerPawn.isAlive().value_or(true)
             && playerPawn.health().greaterThan(0).valueOr(true)
             && !playerPawn.isControlledByLocalPlayer()
             && playerPawn.isTTorCT()

diff --git a/Source/Features/Visuals/ModelGlow/TickingBombModelGlow/TickingBombModelGlow.h b/Source/Features/Visuals/ModelGlow/TickingBombModelGlow/TickingBombModelGlow.h
@@ -42,7 +42,7 @@ class TickingBombModelGlow {
 
     [[nodiscard]] bool isEnabled() const noexcept
     {
-        return state().tickingBombModelGlow == ModelGlowState::State::Enabled;
+        return state().masterSwitch == ModelGlowState::State::Enabled && state().tickingBombModelGlow == ModelGlowState::State::Enabled;
     }
 
     [[nodiscard]] bool shouldGlowPlantedBombModel(auto&& plantedBomb) const noexcept

diff --git a/Source/Features/Visuals/ModelGlow/WeaponModelGlow/WeaponModelGlow.h b/Source/Features/Visuals/ModelGlow/WeaponModelGlow/WeaponModelGlow.h
@@ -85,7 +85,7 @@ class WeaponModelGlow {
 
     [[nodiscard]] bool shouldGlowWeaponModel(auto&& weapon) const noexcept
     {
-        return !weapon.baseEntity().hasOwner().valueOr(true);
+        return state().masterSwitch == ModelGlowState::State::Enabled && !weapon.baseEntity().hasOwner().valueOr(true);
     }
 
     [[nodiscard]] auto& state() const noexcept