.take is useless :p

BlueWitherer · BlueWitherer · commit 8566b1ffbac1 · 2026-05-12T21:54:07.000-05:00
diff --git a/src/hooks/Mock.cpp b/src/hooks/Mock.cpp
@@ -87,11 +87,11 @@ class $modify(MockMenuLayer, MenuLayer) {
                                     ss->setPositionY(s->getScaledContentHeight() * yA);
                                     ss->setRotation(360.f * (yA * yB));  // random rotation
 
-                                    auto move = CCEaseIn::create(CCMoveTo::create(10.f, {s->getScaledContentWidth() + 192.f, s.take()->getScaledContentHeight() * yB}), 1.f);
+                                    auto move = CCEaseIn::create(CCMoveTo::create(10.f, {s->getScaledContentWidth() + 192.f, s->getScaledContentHeight() * yB}), 1.f);
                                     auto rotate = CCEaseOut::create(CCRotateBy::create(12.5f, 45.f), 1.f);
 
                                     auto action = CCSpawn::createWithTwoActions(move, rotate);
-                                    ss.take()->runAction(action);
+                                    ss->runAction(action);
 
                                     log::info("Animated sprite successfully");
                                 } else {
diff --git a/src/hooks/obstructive/Adverts.cpp b/src/hooks/obstructive/Adverts.cpp
@@ -48,7 +48,7 @@ class $modify(AdvertsPlayLayer, PlayLayer) {
         };
 
         queueInMainThread([self = WeakRef(this)]() {
-            if (auto s = self.lock()) s.take()->nextAd();
+            if (auto s = self.lock()) s->nextAd();
         });
     };
 };
diff --git a/src/hooks/obstructive/Flipped.cpp b/src/hooks/obstructive/Flipped.cpp
@@ -44,7 +44,7 @@ class $modify(FlippedPlayLayer, PlayLayer) {
         if (rng::fast() > m_fields->chance) runAction(CCEaseSineOut::create(CCRotateBy::create(0.875f, 180.f)));
 
         queueInMainThread([self = WeakRef(this)]() {
-            if (auto s = self.lock()) s.take()->nextFlip();
+            if (auto s = self.lock()) s->nextFlip();
         });
     };
 };
diff --git a/src/hooks/obstructive/Math.cpp b/src/hooks/obstructive/Math.cpp
@@ -52,11 +52,11 @@ class $modify(MathPlayLayer, PlayLayer) {
                             log::debug("math {}", correct ? "succeeded" : "failed");
 
                             if (!correct) s->resetLevelFromStart();
-                            s.take()->nextQuiz();
+                            s->nextQuiz();
 
                             cursor::hide();
 
-                            if (auto quiz = math.lock()) quiz.take()->removeFromParent();
+                            if (auto quiz = math.lock()) quiz->removeFromParent();
                         };
                     });
 
@@ -67,7 +67,7 @@ class $modify(MathPlayLayer, PlayLayer) {
                 };
             } else {
                 queueInMainThread([self = WeakRef(this)]() {
-                    if (auto s = self.lock()) s.take()->nextQuiz();
+                    if (auto s = self.lock()) s->nextQuiz();
                 });
             };
         };
diff --git a/src/hooks/obstructive/Spam.cpp b/src/hooks/obstructive/Spam.cpp
@@ -63,11 +63,11 @@ class $modify(SpamPlayLayer, PlayLayer) {
                             log::debug("spam {}", success ? "succeeded" : "failed");
 
                             if (!success) s->resetLevelFromStart();
-                            s.take()->nextSpam();
+                            s->nextSpam();
 
                             cursor::hide();
 
-                            if (auto spam = challenge.lock()) spam.take()->removeFromParent();
+                            if (auto spam = challenge.lock()) spam->removeFromParent();
                         };
                     });
 
@@ -78,7 +78,7 @@ class $modify(SpamPlayLayer, PlayLayer) {
                 };
             } else {
                 queueInMainThread([self = WeakRef(this)]() {
-                    if (auto s = self.lock()) s.take()->nextSpam();
+                    if (auto s = self.lock()) s->nextSpam();
                 });
             };
         };
diff --git a/src/hooks/obstructive/WhackAFace.cpp b/src/hooks/obstructive/WhackAFace.cpp
@@ -44,7 +44,7 @@ class $modify(WhackAFacePlayLayer, PlayLayer) {
             queueInMainThread([self = WeakRef(this)]() {
                 if (auto s = self.lock()) {
                     s->unschedule(schedule_selector(WhackAFacePlayLayer::doWhack));
-                    s.take()->nextWhack();
+                    s->nextWhack();
                 };
             });
 
@@ -83,11 +83,11 @@ class $modify(WhackAFacePlayLayer, PlayLayer) {
                     whack->setCallback([self = WeakRef(this), whackButton = WeakRef(whack)](bool success) {
                         if (auto whack = whackButton.lock()) {
                             if (!success) {
-                                if (auto s = self.lock()) s.take()->resetLevelFromStart();
+                                if (auto s = self.lock()) s->resetLevelFromStart();
                             };
 
                             cursor::show();
-                            whack.take()->removeFromParent();
+                            cue::resetNode(whack);
                         };
                     });
                     whack->setPosition(CCPoint{winSize.width * rng::get(0.75f, 0.25f), winSize.height * rng::get(0.75f, 0.25f)} / 2.f);
@@ -97,7 +97,7 @@ class $modify(WhackAFacePlayLayer, PlayLayer) {
                 };
 
                 queueInMainThread([self = WeakRef(this)]() {
-                    if (auto s = self.lock()) s.take()->nextWhack();
+                    if (auto s = self.lock()) s->nextWhack();
                 });
             };
         };
@@ -107,7 +107,7 @@ class $modify(WhackAFacePlayLayer, PlayLayer) {
         auto f = m_fields.self();
 
         for (auto& whackBtn : f->active) {
-            if (auto btn = whackBtn.lock()) btn.take()->removeFromParent();
+            if (auto btn = whackBtn.lock()) btn->removeFromParent();
         };
 
         f->active.clear();
diff --git a/src/ui/Menu.h b/src/ui/Menu.h
@@ -48,7 +48,7 @@ namespace horrible {
         // Open the Horrible Menu mod option menu
         inline void open() {
             if (auto old = Menu::get()) {
-                old->removeFromParent();
+                cue::resetNode(old);
             } else if (auto popup = Menu::create()) {
                 popup->show();
             };
diff --git a/src/ui/src/Menu.cpp b/src/ui/src/Menu.cpp
@@ -100,7 +100,7 @@ class Menu::Impl final {
                             optionList->m_contentLayer->addChild(modOption);
                         } else {
                             log::error("{} is incompatible with the current platform", o->getID());
-                            modOption->removeFromParent();
+                            cue::resetNode(modOption);
                         };
                     };
                 };
@@ -163,7 +163,7 @@ void Menu::setupImageBackground(fs::path const& path) {
                     if (auto bg = themeBg.lock()) {
                         if (res.isOk()) {
                             cue::rescaleToMatch(bg, s->m_bgSprite, true);
-                            bg.take()->setOpacity(100);
+                            bg->setOpacity(100);
 
                             log::debug("Successfully loaded theme background");
                         } else if (res.isErr()) {
@@ -551,7 +551,7 @@ bool Menu::init() {
 };
 
 void Menu::onExit() {
-    if (auto credits = MenuCredits::get()) credits->removeFromParent();
+    if (auto credits = MenuCredits::get()) cue::resetNode(credits);
     s_inst = nullptr;
 
     Popup::onExit();
diff --git a/src/ui/src/MenuButton.cpp b/src/ui/src/MenuButton.cpp
@@ -40,7 +40,7 @@ class MenuButton::Impl final {
     CCPoint dragStartPos = {0, 0};
     CCPoint comparePos = {0, 0};
 
-    Ref<CircleButtonSprite> sprite = nullptr;
+    CircleButtonSprite* sprite = nullptr;
 
     bool isAnimating = false;
 
@@ -56,7 +56,7 @@ MenuButton::MenuButton() : m_impl(std::make_unique<Impl>()) {};
 MenuButton::~MenuButton() {};
 
 void MenuButton::setupSprite() {
-    if (auto sprite = m_impl->sprite.take()) sprite->removeFromParent();
+    cue::resetNode(m_impl->sprite);
 
     m_impl->sprite = CircleButtonSprite::createWithSpriteFrameName(
         themes::getIconSprite(m_impl->btnIcon),
diff --git a/src/util/ui/src/RandomAd.cpp b/src/util/ui/src/RandomAd.cpp
@@ -35,7 +35,7 @@ bool RandomAd::init() {
     projThumb->setLoadCallback([thumbnail = WeakRef(projThumb)](Result<> res) {
         if (res.isOk()) {
             log::info("Sprite loaded successfully");
-            if (auto thumb = thumbnail.lock()) thumb.take()->setScale(0.625);
+            if (auto thumb = thumbnail.lock()) thumb->setScale(0.625);
         } else {
             log::error("Sprite failed to load: {}", res.unwrapErr());
         };
@@ -56,7 +56,7 @@ bool RandomAd::init() {
             themes::getButtonSquareSprite(theme)),
         [loading = WeakRef(playBtnLoading)](Button* sender) {
             sender->setVisible(false);
-            if (auto load = loading.lock()) load.take()->setVisible(true);
+            if (auto load = loading.lock()) load->setVisible(true);
 
             if (auto pl = PlayLayer::get()) {
                 log::info("Switching from ad to Congregation jumpscare");
diff --git a/src/util/ui/src/SpamChallenge.cpp b/src/util/ui/src/SpamChallenge.cpp
@@ -111,7 +111,7 @@ void SpamChallenge::callAfterFeedback(float) {
 void SpamChallenge::setSuccess(bool v) {
     m_impl->success = v;
 
-    if (m_impl->counter) m_impl->counter->removeFromParent();
+    cue::resetNode(m_impl->counter);
 
     auto symbol = CCSprite::createWithSpriteFrameName(m_impl->success ? "GJ_completesIcon_001.png" : "GJ_deleteIcon_001.png");
     symbol->setID("success-icon");
diff --git a/src/util/ui/src/WhackButton.cpp b/src/util/ui/src/WhackButton.cpp
@@ -49,7 +49,7 @@ WhackButton::WhackButton() : m_impl(std::make_unique<Impl>()) {};
 WhackButton::~WhackButton() {};
 
 void WhackButton::reload() {
-    if (auto btn = WeakRef(m_impl->button).lock()) btn.take()->removeFromParent();
+    cue::resetNode(m_impl->button);
 
     auto diff = m_impl->inputTarget - m_impl->inputCount;
 
@@ -65,9 +65,9 @@ void WhackButton::reload() {
 
                 if (s->m_impl->inputCount >= s->m_impl->inputTarget) {
                     s->unscheduleUpdate();
-                    s.take()->setSuccess(true);
+                    s->setSuccess(true);
                 } else {
-                    s.take()->reload();
+                    s->reload();
                 };
             };
         });
@@ -121,7 +121,7 @@ void WhackButton::callAfterFeedback(float) {
 void WhackButton::setSuccess(bool v) {
     m_impl->success = v;
 
-    if (m_impl->button) m_impl->button->removeFromParent();
+    cue::resetNode(m_impl->button);
 
     auto symbol = CCSprite::createWithSpriteFrameName(v ? "GJ_completesIcon_001.png" : "GJ_deleteIcon_001.png");
     symbol->setID("success-icon");
