blur moved

Author: BlueWitherer

include/Horrible.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Geode/loader/Loader.hpp"
 #ifdef GEODE_IS_WINDOWS
 #ifdef AWCW_HORRIBLE_API_EXPORTING
 #define AWCW_HORRIBLE_API_DLL __declspec(dllexport)
@@ -173,14 +172,6 @@ namespace horrible {
         if (auto om = horrible::OptionManager::get()) om->registerOption(opt); \
     }
 
-// Statically register an option on game load, if another mod is loaded
-#define HORRIBLE_REGISTER_OPTION_DEPENDENCY(opt, modId)                            \
-    $on_game(Loaded) {                                                             \
-        if (Loader::get()->isModLoaded(modId)) {                                   \
-            if (auto om = horrible::OptionManager::get()) om->registerOption(opt); \
-        };                                                                         \
-    }
-
 // Delegate hooks to OptionManager for dynamic toggling
 #define HORRIBLE_DELEGATE_HOOKS(optID)                \
     static void onModify(auto& self) {                \

include/OptionalAPI.hpp

@@ -18,7 +18,7 @@ namespace horrible {
         using Event::Event;
     };
 
-    // Bridge to option manager for Horrible Ideas
+    // Optional bridge to option manager for Horrible Ideas
     class OptionManagerV2 final {
     public:
         /**

src/Utils.hpp

@@ -2,7 +2,6 @@
 
 #include <Horrible.hpp>
 
-#include <util/Blur.hpp>
 #include <util/Jumpscares.hpp>
 #include <util/Menu.hpp>
 #include <util/Options.hpp>
@@ -29,7 +28,7 @@ namespace horrible {
      *
      * @param chance The chance setting number
      */
-    inline float chanceToDelayPct(int chance) noexcept {
+    inline constexpr float chanceToDelayPct(int chance = 50) noexcept {
         if (chance <= 0) chance = 1;
         if (chance > 100) chance = 100;
 

src/hooks/PlayLayer/BlurGame.cpp

@@ -1,10 +1,10 @@
 #include <Utils.hpp>
 
+#include <ranges>
+
 #include <menu/OptionMenuButton.hpp>
 #include <menu/SettingV3.hpp>
 
-#include <ranges>
-
 #include <Geode/modify/PlayLayer.hpp>
 #include <Geode/modify/PauseLayer.hpp>
 #include <Geode/modify/GJGameLevel.hpp>
@@ -14,7 +14,7 @@
 using namespace horrible::prelude;
 
 inline static std::vector<Hook*> safeModeHooks;
-inline static std::vector<Hook*> floatingBtnHooks;
+inline static std::vector<std::weak_ptr<Hook>> floatingBtnHooks;
 
 #define HORRIBLE_HOOK_SAFEMODE(hookName)                                   \
     static void onModify(auto& self) {                                     \
@@ -39,7 +39,7 @@ inline static std::vector<Hook*> floatingBtnHooks;
             hook->setAutoEnable(enable);                                    \
             (void)hook->toggle(enable);                                     \
                                                                             \
-            floatingBtnHooks.push_back(hook.get());                         \
+            floatingBtnHooks.push_back(hook);                               \
         };                                                                  \
     }
 
@@ -68,8 +68,10 @@ inline static std::vector<Hook*> floatingBtnHooks;
             if (auto fb = OptionMenuButton::get()) fb->setVisible(value);
 
             for (auto& hook : floatingBtnHooks) {
-                log::trace("Toggling floating button hook '{}' {}...", hook->getDisplayName(), value ? "ON" : "OFF");
-                (void)hook->toggle(value);
+                if (auto h = hook.lock()) {
+                    log::trace("Toggling floating button hook '{}' {}...", h->getDisplayName(), value ? "ON" : "OFF");
+                    (void)h->toggle(value);
+                };
             };
         });