move some stuff

Author: BlueWitherer

src/Utils.hpp

@@ -2,14 +2,15 @@
 
 #include <Horrible.hpp>
 
-#include <classes/Jumpscares.hpp>
-#include <classes/Menu.hpp>
-#include <classes/Options.hpp>
-#include <classes/Randng.hpp>
+#include <util/Jumpscares.hpp>
+#include <util/Menu.hpp>
+#include <util/Options.hpp>
+#include <util/Randng.hpp>
+#include <util/Themes.hpp>
 
-#include <classes/ui/MathQuiz.hpp>
-#include <classes/ui/RandomAd.hpp>
-#include <classes/ui/SpamChallenge.hpp>
+#include <util/ui/MathQuiz.hpp>
+#include <util/ui/RandomAd.hpp>
+#include <util/ui/SpamChallenge.hpp>
 
 #include <cocos2d.h>
 
@@ -27,7 +28,7 @@ namespace horrible {
      *
      * @param chance The chance setting number
      */
-    inline float chanceToDelayPct(int chance) {
+    inline float chanceToDelayPct(int chance) noexcept {
         if (chance <= 0) chance = 1;
         if (chance > 100) chance = 100;
 
@@ -40,66 +41,7 @@ namespace horrible {
      * @param name Name of the audio file
      */
     inline void playSfx(const char* file) {
-        if (auto fmod = FMODAudioEngine::sharedEngine()) fmod->playEffectAsync(file);
-    };
-
-    // Get the current theme's sprites and colors
-    namespace theme {
-        inline constexpr auto square = "square02_001.png";
-
-        // Theme options
-        namespace enums {
-            inline constexpr auto Blue = "Blue";
-            inline constexpr auto Green = "Green";
-            inline constexpr auto Dark = "Dark";
-            inline constexpr auto Light = "Light";
-            inline constexpr auto Dim = "Dim";
-            inline constexpr auto Girlypop = "Girlypop";
-            inline constexpr auto Aqua = "Aqua";
-            inline constexpr auto Geode = "Geode";
-        };
-
-        // Get the current theme's background sprite name
-        inline const char* getBackgroundSprite(std::string_view theme) {
-            if (theme == enums::Blue) return "GJ_square02.png";
-            if (theme == enums::Green) return "GJ_square03.png";
-            if (theme == enums::Dark) return "geode.loader/GE_square02.png";
-            if (theme == enums::Light) return "geode.loader/white-square.png";
-            if (theme == enums::Dim) return "GJ_square05.png";
-            if (theme == enums::Girlypop) return "GJ_square04.png";
-            if (theme == enums::Aqua) return "geode.loader/GE_square03.png";
-            if (theme == enums::Geode) return "geode.loader/GE_square01.png";
-
-            return "GJ_square01.png";
-        };
-
-        // Get the current theme's circle base color enum
-        inline geode::CircleBaseColor getCircleBaseColor(std::string_view theme) {
-            if (theme == enums::Blue) return geode::CircleBaseColor::Blue;
-            if (theme == enums::Green) return geode::CircleBaseColor::Green;
-            if (theme == enums::Dark) return geode::CircleBaseColor::Gray;
-            if (theme == enums::Light) return geode::CircleBaseColor::Gray;
-            if (theme == enums::Dim) return geode::CircleBaseColor::Gray;
-            if (theme == enums::Girlypop) return geode::CircleBaseColor::Pink;
-            if (theme == enums::Aqua) return geode::CircleBaseColor::DarkAqua;
-            if (theme == enums::Geode) return geode::CircleBaseColor::DarkPurple;
-
-            return geode::CircleBaseColor::Green;
-        };
-
-        // Get the current theme's square button sprite name
-        inline const char* getButtonSquareSprite(std::string_view theme) {
-            if (theme == enums::Blue) return "GJ_button_02.png";
-            if (theme == enums::Green) return "GJ_button_01.png";
-            if (theme == enums::Dark) return "GJ_button_05.png";
-            if (theme == enums::Light) return "GJ_button_04.png";
-            if (theme == enums::Dim) return "GJ_button_04.png";
-            if (theme == enums::Girlypop) return "GJ_button_03.png";
-            if (theme == enums::Aqua) return "geode.loader/GE_button_05.png";
-            if (theme == enums::Geode) return "geode.loader/GE_button_05.png";
-
-            return "GJ_button_01.png";
-        };
+        if (auto fmod = FMODAudioEngine::sharedEngine()) (void)fmod->playEffectAsync(file);
     };
 
     namespace str = geode::utils::string; // Shortcut for geode::utils::string

src/hooks/PlayLayer/BlackScreen.cpp

@@ -36,7 +36,7 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
 
         auto const winSize = CCDirector::sharedDirector()->getWinSize();
 
-        auto blackScreen = NineSlice::create(theme::square);
+        auto blackScreen = NineSlice::create(themes::square);
         blackScreen->setID("blink"_spr);
         blackScreen->setContentSize({ winSize.width + 10.f, winSize.height + 10.f });
         blackScreen->setPosition(winSize / 2.f);

src/hooks/PlayLayer/Math.cpp

@@ -47,20 +47,19 @@ class $modify(MathPlayLayer, PlayLayer) {
             log::info("Showing math quiz");
 
             if (auto quiz = MathQuiz::create()) {
-                f->m_currentQuiz = quiz;
-
                 // clear pointer on close / handle correct/wrong answer
-                f->m_currentQuiz->setCallback([this, f](bool correct) {
+                quiz->setCallback([this, quiz](bool correct) {
                     nextQuiz();
 
                     if (!correct) resetLevelFromStart();
-                    if (f->m_currentQuiz) f->m_currentQuiz->removeMeAndCleanup();
-                                              });
+                    if (quiz) quiz->removeMeAndCleanup();
+                    });
 
 #ifdef GEODE_IS_WINDOWS
                 CCEGLView::sharedOpenGLView()->showCursor(true);
 #endif
-                m_uiLayer->addChild(f->m_currentQuiz, 99);
+                m_uiLayer->addChild(quiz, 99);
+                f->m_currentQuiz = quiz;
             };
         };
     };

src/hooks/PlayLayer/Spam.cpp

@@ -44,20 +44,19 @@ class $modify(SpamPlayLayer, PlayLayer) {
             log::info("Showing spam challenge");
 
             if (auto spam = SpamChallenge::create()) {
-                f->m_currentSpam = spam;
-
                 // clear pointer on close / handle correct/wrong answer
-                f->m_currentSpam->setCallback([this, f](bool success) {
+                spam->setCallback([this, spam](bool success) {
                     nextSpam();
 
                     if (!success) resetLevelFromStart();
-                    if (f->m_currentSpam) f->m_currentSpam->removeMeAndCleanup();
-                                              });
+                    if (spam) spam->removeMeAndCleanup();
+                    });
 
 #ifdef GEODE_IS_WINDOWS
                 CCEGLView::sharedOpenGLView()->showCursor(true);
 #endif
-                m_uiLayer->addChild(f->m_currentSpam, 99);
+                m_uiLayer->addChild(spam, 99);
+                f->m_currentSpam = spam;
             };
         };
     };

src/menu/src/OptionCategoryItem.cpp

@@ -26,7 +26,7 @@ bool OptionCategoryItem::init(CCSize const& size, std::string category) {
     setContentSize(size);
     setAnchorPoint({ 0.5, 1 });
 
-    auto bg = NineSlice::create(theme::square);
+    auto bg = NineSlice::create(themes::square);
     bg->setID("background");
     bg->setAnchorPoint({ 0, 0 });
     bg->setContentSize(getScaledContentSize());

src/menu/src/OptionItem.cpp

@@ -52,7 +52,7 @@ bool OptionItem::init(CCSize const& size, Option option) {
     setContentSize(size);
     setAnchorPoint({ 0.5, 1 });
 
-    auto bg = NineSlice::create(theme::square);
+    auto bg = NineSlice::create(themes::square);
     bg->setID("background");
     bg->setAnchorPoint({ 0, 0 });
     bg->setContentSize(getScaledContentSize());

src/menu/src/OptionMenu.cpp

@@ -85,17 +85,17 @@ OptionMenu::OptionMenu() : m_impl(std::make_unique<Impl>()) {};
 OptionMenu::~OptionMenu() {};
 
 bool OptionMenu::init() {
-    auto btns = theme::getCircleBaseColor(m_impl->theme);
+    auto btns = themes::getCircleBaseColor(m_impl->theme);
 
-    if (!Popup::init(450.f, 280.f, theme::getBackgroundSprite(m_impl->theme))) return false;
+    if (!Popup::init(450.f, 280.f, themes::getBackgroundSprite(m_impl->theme))) return false;
 
     setID("options"_spr);
     setTitle("Horrible Options");
     setCloseButtonSpr(CircleButtonSprite::createWithSpriteFrameName("geode.loader/close.png", 0.875f, btns, CircleBaseSize::Small));
 
     auto mainLayerSize = m_mainLayer->getScaledContentSize();
 
-    auto categoryListBg = NineSlice::create(theme::square);
+    auto categoryListBg = NineSlice::create(themes::square);
     categoryListBg->setAnchorPoint({ 0.5, 0.5 });
     categoryListBg->setPosition({ mainLayerSize.width - 82.5f, 75.f });
     categoryListBg->setContentSize({ (mainLayerSize.width / 3.f) - 10.f, 95.f });
@@ -146,7 +146,7 @@ bool OptionMenu::init() {
     m_mainLayer->addChild(m_impl->categoryList, 1);
 
     // Add a background sprite to the popup
-    auto optionListBg = NineSlice::create(theme::square);
+    auto optionListBg = NineSlice::create(themes::square);
     optionListBg->setAnchorPoint({ 0.5, 0.5 });
     optionListBg->setPosition({ (mainLayerSize.width / 2.f) - 77.5f, (mainLayerSize.height / 2.f) - 32.5f });
     optionListBg->setContentSize({ (mainLayerSize.width / 1.5f) - 20.f, mainLayerSize.height - 85.f });
@@ -187,7 +187,7 @@ bool OptionMenu::init() {
     m_mainLayer->addChild(m_impl->searchInput);
 
     // add a list button background
-    auto filterContainerBg = NineSlice::create(theme::square);
+    auto filterContainerBg = NineSlice::create(themes::square);
     filterContainerBg->setAnchorPoint({ 0.5, 0.5 });
     filterContainerBg->setPosition({ mainLayerSize.width - 82.5f, (mainLayerSize.height / 2.f) - 12.5f });
     filterContainerBg->setContentSize({ (mainLayerSize.width / 3.f), mainLayerSize.height - 45.f });
@@ -225,7 +225,7 @@ bool OptionMenu::init() {
     };
 
     for (auto const& filterBtn : filterBtns) {
-        if (auto btnSprite = ButtonSprite::create(filterBtn.label, 155, true, "bigFont.fnt", theme::getButtonSquareSprite(m_impl->theme), 0.f, 0.8f)) {
+        if (auto btnSprite = ButtonSprite::create(filterBtn.label, 155, true, "bigFont.fnt", themes::getButtonSquareSprite(m_impl->theme), 0.f, 0.8f)) {
             btnSprite->m_label->setColor(filterBtn.color);
             btnSprite->setScale(0.8f);
 

src/menu/src/OptionMenuButton.cpp

@@ -34,7 +34,7 @@ void OptionMenuButton::setupSprite() {
     m_impl->sprite = CircleButtonSprite::createWithSprite(
         "icon.png"_spr,
         0.925f,
-        theme::getCircleBaseColor(m_impl->theme)
+        themes::getCircleBaseColor(m_impl->theme)
     );
     m_impl->sprite->setAnchorPoint({ 0.5, 0.5 });
 

src/menu/src/SettingV3.cpp

@@ -56,7 +56,7 @@ bool HorribleSettingNodeV3::init(std::shared_ptr<HorribleSettingV3> setting, flo
     auto buttonSprite = ButtonSprite::create(
         "Horrible Options Menu",
         "bigFont.fnt",
-        theme::getButtonSquareSprite(m_impl->theme),
+        themes::getButtonSquareSprite(m_impl->theme),
         0.875f
     );
     buttonSprite->setScale(0.5f);
@@ -88,7 +88,7 @@ bool HorribleSettingNodeV3::init(std::shared_ptr<HorribleSettingV3> setting, flo
                 auto buttonSprite = ButtonSprite::create(
                     "Horrible Options Menu",
                     "bigFont.fnt",
-                    theme::getButtonSquareSprite(m_impl->theme),
+                    themes::getButtonSquareSprite(m_impl->theme),
                     0.875f
                 );
                 buttonSprite->setScale(0.5f);