fix playlayer leaks

Author: BlueWitherer

src/hooks/obstructive/Math.cpp

@@ -47,11 +47,6 @@ class $modify(MathPlayLayer, PlayLayer) {
         nextQuiz();
     };
 
-    void onQuit() {
-        cue::resetNode(m_fields->currentMath);
-        PlayLayer::onQuit();
-    };
-
     void nextQuiz() {
         log::trace("scheduling math quiz");
 
@@ -67,15 +62,13 @@ class $modify(MathPlayLayer, PlayLayer) {
 
             if (auto quiz = MathQuiz::create()) {
                 // handle correct/wrong answer
-                quiz->setCallback([self = WeakRef(this), math = WeakRef(quiz)](bool correct) {
-                    if (auto s = self.lock()) {
-                        if (!correct) s->resetLevelFromStart();
-                        s->nextQuiz();
+                quiz->setCallback([this, quiz](bool correct) {
+                    if (!correct) resetLevelFromStart();
+                    nextQuiz();
 
-                        cursor::hide();
+                    cursor::hide();
 
-                        if (auto quiz = math.lock()) quiz->removeFromParent();
-                    };
+                    if (quiz) quiz->removeFromParent();
                 });
 
                 m_uiLayer->addChild(quiz, 99);

src/hooks/obstructive/Spam.cpp

@@ -47,11 +47,6 @@ class $modify(SpamPlayLayer, PlayLayer) {
         nextSpam();
     };
 
-    void onQuit() {
-        cue::resetNode(m_fields->currentSpam);
-        PlayLayer::onQuit();
-    };
-
     void destroyPlayer(PlayerObject* player, GameObject* object) {
         PlayLayer::destroyPlayer(player, object);
 
@@ -78,15 +73,13 @@ class $modify(SpamPlayLayer, PlayLayer) {
                 auto f = m_fields.self();
 
                 // handle correct/wrong answer
-                spam->setCallback([self = WeakRef(this), challenge = WeakRef(spam)](bool success) {
-                    if (auto s = self.lock()) {
-                        if (!success) s->resetLevelFromStart();
-                        s->nextSpam();
+                spam->setCallback([this, spam](bool success) {
+                    if (!success) resetLevelFromStart();
+                    nextSpam();
 
-                        cursor::hide();
+                    cursor::hide();
 
-                        if (auto spam = challenge.lock()) spam->removeFromParent();
-                    };
+                    if (spam) spam->removeFromParent();
                 });
 
                 m_uiLayer->addChild(spam, 99);

src/hooks/obstructive/WhackAFace.cpp

@@ -96,15 +96,11 @@ class $modify(WhackAFacePlayLayer, PlayLayer) {
                 if (auto whack = WhackButton::create()) {
                     auto const winSize = m_uiLayer->getScaledContentSize();
 
-                    whack->setCallback([self = WeakRef(this), whackButton = WeakRef(whack)](bool success) {
-                        if (auto whack = whackButton.lock()) {
-                            if (!success) {
-                                if (auto s = self.lock()) s->resetLevelFromStart();
-                            };
-
-                            cursor::show();
-                            whack->removeFromParent();
-                        };
+                    whack->setCallback([this, whack](bool success) {
+                        if (!success) resetLevelFromStart();
+
+                        cursor::show();
+                        whack->removeFromParent();
                     });
                     whack->setPosition(CCPoint{winSize.width * rng::get(0.75f, 0.25f), winSize.height * rng::get(0.75f, 0.25f)} / 2.f);
 

src/util/ui/src/WhackButton.cpp

@@ -58,17 +58,15 @@ void WhackButton::reload() {
             s_severities.at(diff),
             1.f,
             m_impl->getButtonColor(diff)),
-        [self = WeakRef(this)](auto) {
-            if (auto s = self.lock()) {
-                s->m_impl->inputCount += 1;
-                sfx::play("chestClick.ogg");
-
-                if (s->m_impl->inputCount >= s->m_impl->inputTarget) {
-                    s->setSuccess(true);
-                    s->unscheduleUpdate();
-                } else {
-                    s->reload();
-                };
+        [this](auto) {
+            m_impl->inputCount += 1;
+            sfx::play("chestClick.ogg");
+
+            if (m_impl->inputCount >= m_impl->inputTarget) {
+                setSuccess(true);
+                unscheduleUpdate();
+            } else {
+                reload();
             };
         });
     m_impl->button->setID("whackable-btn");