me when i manage ur memory

Author: BlueWitherer

include/horrible/API.h

@@ -27,15 +27,15 @@ namespace horrible {
     class BRKD_HORRIBLE_API_DLL OptionManager final {
         friend class Option;
 
+        // Type alias for `geode::Function<void(bool)>`, used in hook delegation
+        using Callback = geode::Function<void(bool)>;
+
     private:
         geode::utils::StringMap<std::shared_ptr<Option>> m_options;  // Map of registered options
         std::vector<std::string> m_categories;                       // Array of auto-registered categories
 
         geode::utils::StringMap<const geode::Mod* const> m_integrations;  // Map of auto-registered external mods using this API
 
-        // Type alias for `geode::Function<void(bool)>`, used in hook delegation
-        using Callback = geode::Function<void(bool)>;
-
         std::unordered_map<std::string_view, std::vector<Callback>> m_delegates;  // Map of option ID to array of delegates to call when that option is toggled
 
     protected:

src/hooks/GJBaseGameLayer/TOS.cpp

@@ -20,7 +20,7 @@ class $modify(TOSGJBaseGameLayer, GJBaseGameLayer) {
     HORRIBLE_DELEGATE_HOOKS(THIS_ID);
 
     struct Fields {
-        TermsAndConditions* currentTos = nullptr;
+        Ref<TermsAndConditions> currentTos = nullptr;
     };
 
     void handleButton(bool down, int button, bool isPlayer1) {
@@ -29,8 +29,8 @@ class $modify(TOSGJBaseGameLayer, GJBaseGameLayer) {
         if (down) {
             auto f = m_fields.self();
 
-            if (auto popup = WeakRef(f->currentTos).lock()) {
-                popup.take()->removeFromParent();
+            if (f->currentTos) {
+                f->currentTos.take()->removeFromParent();
                 f->currentTos = nullptr;
             } else if (auto popup = TermsAndConditions::create(
                            [this](bool accepted) {

src/hooks/PlayLayer/WhackAFace.cpp

@@ -107,7 +107,7 @@ class $modify(WhackAFacePlayLayer, PlayLayer) {
         auto f = m_fields.self();
 
         for (auto& whackBtn : f->active) {
-            if (auto btn = whackBtn.lock()) btn->removeFromParent();
+            if (auto btn = whackBtn.lock()) btn.take()->removeFromParent();
         };
 
         f->active.clear();

src/ui/MenuOption.h

@@ -6,12 +6,12 @@
 
 namespace horrible {
     class MenuOption final : public cocos2d::CCMenu {
+        using Callback = Function<void()>;
+
     private:
         class Impl;
         std::unique_ptr<Impl> m_impl;
 
-        using Callback = Function<void()>;
-
     protected:
         MenuOption();
         ~MenuOption();

src/ui/MenuOptionCategory.h

@@ -4,12 +4,12 @@
 
 namespace horrible {
     class MenuOptionCategory final : public cocos2d::CCMenu {
+        using Callback = geode::Function<void(std::string_view, bool)>;
+
     private:
         class Impl;
         std::unique_ptr<Impl> m_impl;
 
-        using Callback = geode::Function<void(std::string_view, bool)>;
-
     protected:
         MenuOptionCategory();
         ~MenuOptionCategory();

src/util/ui/MathQuiz.hpp

@@ -7,9 +7,7 @@ using namespace geode::prelude;
 namespace horrible {
     namespace ui {
         class MathQuiz final : public CCBlockLayer {
-        private:
-            class Impl;
-            std::unique_ptr<Impl> m_impl;
+            using Callback = Function<void(bool)>;
 
             enum class MathOperation : unsigned int {
                 Addition = 0,
@@ -18,7 +16,9 @@ namespace horrible {
                 Geometry = 3
             };
 
-            using Callback = Function<void(bool)>;
+        private:
+            class Impl;
+            std::unique_ptr<Impl> m_impl;
 
         protected:
             MathQuiz();

src/util/ui/SpamChallenge.hpp

@@ -2,17 +2,15 @@
 
 #include <Geode/Geode.hpp>
 
-using namespace geode::prelude;
-
 namespace horrible {
     namespace ui {
         class SpamChallenge final : public CCBlockLayer {
+            using Callback = geode::Function<void(bool)>;
+
         private:
             class Impl;
             std::unique_ptr<Impl> m_impl;
 
-            using Callback = Function<void(bool)>;
-
         protected:
             SpamChallenge();
             ~SpamChallenge();
@@ -27,7 +25,7 @@ namespace horrible {
         public:
             static SpamChallenge* create();
 
-            bool ccTouchBegan(CCTouch* touch, CCEvent* event) override;
+            bool ccTouchBegan(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) override;
 
             void setCallback(Callback&& cb) &;
         };

src/util/ui/TermsAndConditions.hpp

@@ -2,13 +2,10 @@
 
 #include <Geode/Geode.hpp>
 
-using namespace geode::prelude;
-
 namespace horrible {
     namespace ui {
-        class TermsAndConditions final : public Popup {
-        private:
-            using Callback = CopyableFunction<void(bool)>;
+        class TermsAndConditions final : public geode::Popup {
+            using Callback = geode::CopyableFunction<void(bool)>;
 
         protected:
             bool init(Callback&& cb);

src/util/ui/WhackButton.hpp

@@ -7,12 +7,12 @@ using namespace geode::prelude;
 namespace horrible {
     namespace ui {
         class WhackButton final : public CCNode {
+            using Callback = Function<void(bool)>;
+
         private:
             class Impl;
             std::unique_ptr<Impl> m_impl;
 
-            using Callback = Function<void(bool)>;
-
             void reload();
 
         protected:

src/util/ui/src/TermsAndConditions.cpp

@@ -52,7 +52,7 @@ bool TermsAndConditions::init(Callback&& cb) {
             "bigFont.fnt",
             themes::getButtonSquareSprite(theme)),
         [this, cb](auto) {
-            cb(true);
+            if (cb) cb(true);
             removeFromParent();
         });
     acceptButton->setScale(0.75f);
@@ -63,7 +63,7 @@ bool TermsAndConditions::init(Callback&& cb) {
             "goldFont.fnt",
             themes::getButtonSquareSprite(theme)),
         [this, cb](auto) {
-            cb(false);
+            if (cb) cb(false);
             removeFromParent();
         });
     declineButton->setScale(0.75f);