fix hardcoded setting id

Author: BlueWitherer

src/main.cpp

@@ -17,18 +17,18 @@ using namespace horrible::prelude;
 static std::vector<std::weak_ptr<Hook>> s_safeModeHooks;
 static std::vector<std::weak_ptr<Hook>> s_floatingBtnHooks;
 
-#define HORRIBLE_HOOK_INTERNAL(vectorRef)                                              \
+#define HORRIBLE_HOOK_INTERNAL(hookVector, settingId)                                  \
     static void onModify(auto& self) {                                                 \
         utils::StringMap<std::shared_ptr<Hook>>& hooks = self.m_hooks;                 \
-        auto enable = thisMod->getSettingValue<bool>(setting::FloatingBtn);            \
+        auto enable = thisMod->getSettingValue<bool>(settingId);                       \
                                                                                        \
         for (auto& hook : hooks | std::views::values) {                                \
             hook->setAutoEnable(enable);                                               \
             (void)hook->toggle(enable);                                                \
                                                                                        \
             (void)self.setHookPriorityPre(hook->getDisplayName(), Priority::FirstPre); \
                                                                                        \
-            vectorRef.push_back(hook);                                                 \
+            hookVector.push_back(hook);                                                \
         };                                                                             \
     }
 
@@ -112,7 +112,7 @@ static std::vector<std::weak_ptr<Hook>> s_floatingBtnHooks;
 
 // safe mode
 class $modify(HISafeGJGameLevel, GJGameLevel) {
-    HORRIBLE_HOOK_INTERNAL(s_safeModeHooks);
+    HORRIBLE_HOOK_INTERNAL(s_safeModeHooks, setting::SafeMode);
 
     void savePercentage(int, bool, int, int, bool) {
         log::warn("Safe mode is enabled, so progress will not be saved!");
@@ -121,7 +121,7 @@ class $modify(HISafeGJGameLevel, GJGameLevel) {
 
 // safe mode
 class $modify(HISafePlayLayer, PlayLayer) {
-    HORRIBLE_HOOK_INTERNAL(s_safeModeHooks);
+    HORRIBLE_HOOK_INTERNAL(s_safeModeHooks, setting::SafeMode);
 
     // safe mode prevents level completion
     void levelComplete() {
@@ -136,7 +136,7 @@ class $modify(HISafePlayLayer, PlayLayer) {
 };
 
 class $modify(HIFloatBtnPauseLayer, PauseLayer) {
-    HORRIBLE_HOOK_INTERNAL(s_floatingBtnHooks);
+    HORRIBLE_HOOK_INTERNAL(s_floatingBtnHooks, setting::FloatingBtn);
 
     void customSetup() {
         auto toggle = thisMod->getSettingValue<bool>(setting::FloatingBtn);
@@ -152,7 +152,7 @@ class $modify(HIFloatBtnPauseLayer, PauseLayer) {
 };
 
 class $modify(HIFloatBtnPlayLayer, PlayLayer) {
-    HORRIBLE_HOOK_INTERNAL(s_floatingBtnHooks);
+    HORRIBLE_HOOK_INTERNAL(s_floatingBtnHooks, setting::FloatingBtn);
 
     void setupHasCompleted() {
         toggleButton();

src/ui/src/Menu.cpp

@@ -390,7 +390,7 @@ bool Menu::init() {
 
     m_mainLayer->addChild(sillyDropdown, 9);
 
-    m_mainLayer->addChild(m_impl->createFilterLabel("Silly Tier", "silly-filter-label", {m_impl->categoryList->getPositionX(), sillyDropdown->getPositionY() + 8.75f}), 1);
+    m_mainLayer->addChild(m_impl->createFilterLabel("Silliness", "silly-filter-label", {m_impl->categoryList->getPositionX(), sillyDropdown->getPositionY() + 8.75f}), 1);
 
     auto filterHint = CCLabelBMFont::create("Use different filters to search for options quicker. Press the pin icon on an option cell to pin it to the top.", "chatFont.fnt", m_impl->categoryList->getScaledContentWidth());
     filterHint->setID("filter-hint");

src/ui/src/MenuCredits.cpp

@@ -67,10 +67,10 @@ bool MenuCredits::init(ZStringView theme) {
     setTitle("Credits");
     setCloseButtonSpr(CircleButtonSprite::createWithSpriteFrameName(themes::close, 0.875f, btns, CircleBaseSize::Small));
 
-    addSideArt(m_mainLayer, SideArt::All, SideArtStyle::PopupGold);
-
     popup::closeBtnID(m_closeBtn);
 
+    addSideArt(m_mainLayer, SideArt::All, SideArtStyle::PopupGold);
+
     auto leadDevLabel = CCLabelBMFont::create("Lead Developers", "bigFont.fnt");
     leadDevLabel->setID("lead-dev-label");
     leadDevLabel->setScale(0.425f);