omg pls...

BlueWitherer · BlueWitherer · commit 1221ab27b1be · 2026-05-13T20:31:54.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ else()
 endif()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(HorribleMenu VERSION 1.0.1)
+project(HorribleMenu VERSION 1.0.2)
 
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*.cpp)
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+# v1.0.2 
+- Fix UI ordering issues
+
 # v1.0.1 
 - Fix file path issues with *Mock your 90%+ Fail* option on Android
 
diff --git a/mod.json b/mod.json
@@ -8,7 +8,7 @@
     },
     "id": "cubicstudios.horriblemenu",
     "name": "Horrible Menu",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "developers": [
         "Team Breakeode",
         "Cheeseworks",
diff --git a/src/Utils.h b/src/Utils.h
@@ -27,6 +27,8 @@
 
 #include <Geode/binding/FMODAudioEngine.hpp>
 
+#define HIGHEST_Z cocos2d::CCScene::get()->getHighestChildZ() + 1
+
 // Additional utility methods for Horrible Menu
 namespace horrible {
     // Pointer to this Geode mod
diff --git a/src/hooks/Mock.cpp b/src/hooks/Mock.cpp
@@ -105,7 +105,7 @@ class $modify(MockMenuLayer, MenuLayer) {
                     });
 
                     ss->loadFromFile(pngPath);
-                    addChild(ss, 999);
+                    addChild(ss, HIGHEST_Z);
                 } else {
                     log::error("ID is invalid");
                 };
diff --git a/src/hooks/Parry.cpp b/src/hooks/Parry.cpp
@@ -112,7 +112,7 @@ static auto const o = Option::create(THIS_ID)
 //             m_fields->m_parryBar->setAnchorPoint({ 0.5f, 0.5f });
 //             m_fields->m_parryBar->setVisible(false);
 
-//             addChild(m_fields->m_parryBar, 9999);
+//             m_uiLayer->addChild(m_fields->m_parryBar);
 //         };
 
 //         if (!m_fields->m_parryLabel) {
@@ -123,7 +123,7 @@ static auto const o = Option::create(THIS_ID)
 //             m_fields->m_parryLabel->setVisible(false);
 //             m_fields->m_parryLabel->setID("parry_label"_spr);
 
-//             addChild(m_fields->m_parryLabel, 10000);
+//             m_uiLayer->addChild(m_fields->m_parryLabel);
 //         };
 
 //         scheduleUpdate();
diff --git a/src/hooks/Sticky.cpp b/src/hooks/Sticky.cpp
@@ -50,7 +50,7 @@ class $modify(StickyPlayerObject, PlayerObject) {
                 CCDelayTime::create(0.125f),
                 nullptr);
 
-            pl->m_uiLayer->addChild(f->m_clickLabel, 9);
+            pl->m_uiLayer->addChild(f->m_clickLabel, HIGHEST_Z);
             f->m_clickLabel->runAction(CCRepeatForever::create(seq));
         };
 
diff --git a/src/hooks/obstructive/BlackScreen.cpp b/src/hooks/obstructive/BlackScreen.cpp
@@ -41,7 +41,7 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
         blackScreen->setContentSize(winSize);
         blackScreen->setPosition(winSize / 2.f);
 
-        m_uiLayer->addChild(blackScreen, 99);
+        m_uiLayer->addChild(blackScreen, HIGHEST_Z);
 
         // Schedule removal after 0.5 seconds, then schedule to show again after a random delay
         blackScreen->runAction(CCSequence::createWithTwoActions(
diff --git a/src/hooks/obstructive/Confetti.cpp b/src/hooks/obstructive/Confetti.cpp
@@ -78,7 +78,7 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
             CCSpawn::createWithTwoActions(move, rotate),
             CCCallFuncN::create(this, callfuncN_selector(ConfettiPlayLayer::cleanConfetti)));
 
-        m_uiLayer->addChild(conf, 9);
+        m_uiLayer->addChild(conf, HIGHEST_Z);
         conf->runAction(seq);
     };
 
diff --git a/src/hooks/obstructive/Friends.cpp b/src/hooks/obstructive/Friends.cpp
@@ -75,7 +75,7 @@ class $modify(FriendsPlayLayer, PlayLayer) {
         auto friendAction = CCSequence::createWithTwoActions(action, finish);
         auto scheduleAction = CCCallFunc::create(this, callfunc_selector(FriendsPlayLayer::scheduleNextFriend));
 
-        m_uiLayer->addChild(friendSpr, 9);
+        m_uiLayer->addChild(friendSpr, HIGHEST_Z);
         friendSpr->runAction(CCSpawn::createWithTwoActions(friendAction, scheduleAction));
     };
 
diff --git a/src/hooks/obstructive/Math.cpp b/src/hooks/obstructive/Math.cpp
@@ -71,7 +71,7 @@ class $modify(MathPlayLayer, PlayLayer) {
                     if (quiz) quiz->removeFromParent();
                 });
 
-                m_uiLayer->addChild(quiz, 99);
+                m_uiLayer->addChild(quiz, HIGHEST_Z);
                 f->currentMath = quiz;
 
                 cursor::show();
diff --git a/src/hooks/obstructive/Motivation.cpp b/src/hooks/obstructive/Motivation.cpp
@@ -139,7 +139,7 @@ class $modify(MotivationPlayLayer, PlayLayer) {
                 CCCallFuncN::create(this, callfuncN_selector(MotivationPlayLayer::scheduleNextMessage)),
                 nullptr);
 
-            m_uiLayer->addChild(label, 9);
+            m_uiLayer->addChild(label, HIGHEST_Z);
 
             sfx::play(sfx::file::good);
             label->runAction(action);
diff --git a/src/hooks/obstructive/Spam.cpp b/src/hooks/obstructive/Spam.cpp
@@ -82,7 +82,7 @@ class $modify(SpamPlayLayer, PlayLayer) {
                     if (spam) spam->removeFromParent();
                 });
 
-                m_uiLayer->addChild(spam, 99);
+                m_uiLayer->addChild(spam, HIGHEST_Z);
                 f->currentSpam = spam;
 
                 cursor::show();
diff --git a/src/hooks/obstructive/WhackAFace.cpp b/src/hooks/obstructive/WhackAFace.cpp
@@ -104,7 +104,7 @@ class $modify(WhackAFacePlayLayer, PlayLayer) {
                     });
                     whack->setPosition(CCPoint{winSize.width * rng::get(0.75f, 0.25f), winSize.height * rng::get(0.75f, 0.25f)} / 2.f);
 
-                    m_uiLayer->addChild(whack, 9);
+                    m_uiLayer->addChild(whack, HIGHEST_Z);
                     m_fields->active.push_back(whack);
                 };
 
diff --git a/src/hooks/playerlife/Health.cpp b/src/hooks/playerlife/Health.cpp
@@ -41,7 +41,7 @@ class $modify(HealthPlayLayer, PlayLayer) {
             f->healthBar->setPosition({10.f, getScaledContentHeight() / 2.f});
             f->healthBar->setRotation(-90.f);
 
-            m_uiLayer->addChild(f->healthBar, 99);
+            m_uiLayer->addChild(f->healthBar, HIGHEST_Z);
         };
 
         f->healthBar->updateProgress(f->health);
@@ -54,7 +54,7 @@ class $modify(HealthPlayLayer, PlayLayer) {
             f->healthLabel->setPosition({2.f, (getScaledContentHeight() / 2.f) - (f->healthBar->getScaledContentWidth() / 2.f) - 1.25f});
             f->healthLabel->setScale(0.25f);
 
-            m_uiLayer->addChild(f->healthLabel, 100);
+            m_uiLayer->addChild(f->healthLabel, HIGHEST_Z);
         } else {
             f->healthLabel->setString(hp.c_str());
         };
diff --git a/src/hooks/playerlife/Oxygen.cpp b/src/hooks/playerlife/Oxygen.cpp
@@ -47,7 +47,7 @@ class $modify(OxygenPlayLayer, PlayLayer) {
             f->oxygenBar->setPosition({10.f, getScaledContentHeight() / 2.f});
             f->oxygenBar->setRotation(-90.f);
 
-            m_uiLayer->addChild(f->oxygenBar, 99);
+            m_uiLayer->addChild(f->oxygenBar, HIGHEST_Z);
         };
 
         f->oxygenBar->updateProgress(f->oxygenLevel);
@@ -62,7 +62,7 @@ class $modify(OxygenPlayLayer, PlayLayer) {
             f->oxygenLabel->setPosition({2.f, (getScaledContentHeight() / 2.f) - (f->oxygenBar->getScaledContentWidth() / 2.f) - 1.25f});
             f->oxygenLabel->setScale(0.25f);
 
-            m_uiLayer->addChild(f->oxygenLabel, 100);
+            m_uiLayer->addChild(f->oxygenLabel, HIGHEST_Z);
         } else {
             f->oxygenLabel->setString(o2.c_str());
         };
diff --git a/src/util/ui/src/MathQuiz.cpp b/src/util/ui/src/MathQuiz.cpp
@@ -284,7 +284,7 @@ void MathQuiz::callAfterFeedback(CCNode*) {
 };
 
 void MathQuiz::update(float dt) {
-    if (m_impl->timeRemaining <= 0.f) return;
+    if (m_impl->timeRemaining <= 0.f) return unscheduleUpdate();
     m_impl->timeRemaining -= dt;
 
     m_impl->timeDt += dt;
diff --git a/src/util/ui/src/SpamChallenge.cpp b/src/util/ui/src/SpamChallenge.cpp
@@ -129,7 +129,7 @@ void SpamChallenge::setSuccess(bool v) {
 };
 
 void SpamChallenge::update(float dt) {
-    if (m_impl->timeRemaining <= 0.f) return;
+    if (m_impl->timeRemaining <= 0.f) return unscheduleUpdate();
     m_impl->timeRemaining -= dt;
 
     m_impl->timeDt += dt;
diff --git a/src/util/ui/src/WhackButton.cpp b/src/util/ui/src/WhackButton.cpp
@@ -136,7 +136,7 @@ void WhackButton::setSuccess(bool v) {
 };
 
 void WhackButton::update(float dt) {
-    if (m_impl->timeRemaining <= 0.f) return;
+    if (m_impl->timeRemaining <= 0.f) return unscheduleUpdate();
     m_impl->timeRemaining -= dt;
 
     m_impl->timeDt += dt;
