adjustments

Author: BlueWitherer

src/Utils.hpp

@@ -50,12 +50,12 @@ namespace horrible {
 
     // Default horrible categories
     namespace category {
-        constexpr std::string_view playerlife = "Player Life";
-        constexpr std::string_view jumpscares = "Jumpscares";
-        constexpr std::string_view randoms = "Randoms";
-        constexpr std::string_view chances = "Chances";
-        constexpr std::string_view obstructive = "Obstructive";
-        constexpr std::string_view misc = "Misc";
+        inline constexpr const char* playerlife = "Player Life";
+        inline constexpr const char* jumpscares = "Jumpscares";
+        inline constexpr const char* randoms = "Randoms";
+        inline constexpr const char* chances = "Chances";
+        inline constexpr const char* obstructive = "Obstructive";
+        inline constexpr const char* misc = "Misc";
     };
 
     // Default horrible options

src/hooks/PlayLayer/Confetti.cpp

@@ -8,7 +8,7 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
     struct Fields {
         bool enabled = options::get("confetti");
 
-        static constexpr auto confettis = std::to_array<std::string_view>({
+        static constexpr auto confettis = std::to_array<const char*>({
             "diffIcon_02_btn_001.png",
             "explosionIcon_20_001.png",
             "GJ_duplicateObjectBtn2_001.png",
@@ -53,7 +53,7 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
 
     void createConfetti() {
         if (m_fields->enabled) {
-            auto conf = CCSprite::createWithSpriteFrameName(Fields::confettis[randng::get(Fields::confettis.size() - 1)].data());
+            auto conf = CCSprite::createWithSpriteFrameName(Fields::confettis[randng::get(Fields::confettis.size() - 1)]);
             conf->setPosition({ 0.f, 0.f });
             conf->setScale(0.875f * randng::pc());
 

src/hooks/PlayLayer/Friends.cpp

@@ -8,7 +8,7 @@ class $modify(FriendsPlayLayer, PlayLayer) {
     struct Fields {
         bool enabled = options::get("friends");
 
-        static constexpr auto friends = std::to_array<std::string_view>({
+        static constexpr auto friends = std::to_array<const char*>({
             "diffIcon_00_btn_001.png",
             "diffIcon_01_btn_001.png",
             "diffIcon_02_btn_001.png",
@@ -21,7 +21,7 @@ class $modify(FriendsPlayLayer, PlayLayer) {
             "diffIcon_09_btn_001.png",
             "diffIcon_10_btn_001.png",
             "diffIcon_auto_btn_001.png",
-                                                                        });
+                                                                   });
     };
 
     void setupHasCompleted() {
@@ -50,7 +50,7 @@ class $modify(FriendsPlayLayer, PlayLayer) {
             float yA = getScaledContentHeight() * rA; // starting height pos
             float yB = getScaledContentHeight() * rB; // ending height pos
 
-            Ref<CCSprite> friendSpr = CCSprite::createWithSpriteFrameName(Fields::friends[randng::get(Fields::friends.size() - 1)].data());
+            Ref<CCSprite> friendSpr = CCSprite::createWithSpriteFrameName(Fields::friends[randng::get(Fields::friends.size() - 1)]);
             friendSpr->setPosition({ xA, yA });
             friendSpr->setScale(1.25 * (rB + rA));
             friendSpr->setRotation(180.f * (yA * yB)); // random rotation

src/hooks/PlayLayer/Motivation.cpp

@@ -8,7 +8,7 @@ class $modify(MotivationPlayLayer, PlayLayer) {
     struct Fields {
         bool enabled = options::get("motivation");
 
-        static constexpr auto msgs = std::to_array<std::string_view>({
+        static constexpr auto msgs = std::to_array<const char*>({
             "Surprised you haven't quit already.",
             "OW! I hit my knee on my desk.",
             "mrrp meow :3",
@@ -94,7 +94,7 @@ class $modify(MotivationPlayLayer, PlayLayer) {
             "Have you made it past 67% yet?",
             "I think you could use some ASMR.",
             "You gotta chill...",
-                                                                     });
+                                                                });
     };
 
     void setupHasCompleted() {
@@ -112,7 +112,7 @@ class $modify(MotivationPlayLayer, PlayLayer) {
 
     void showMessage(float) {
         if (m_fields->enabled && !m_hasCompletedLevel) {
-            auto label = CCLabelBMFont::create(Fields::msgs[randng::get(Fields::msgs.size())].data(), "bigFont.fnt", getScaledContentWidth() - 12.5f);
+            auto label = CCLabelBMFont::create(Fields::msgs[randng::get(Fields::msgs.size())], "bigFont.fnt", getScaledContentWidth() - 12.5f);
             label->setAnchorPoint({ 0.5, 0 });
             label->setPosition({ getScaledContentWidth() / 2.f, -label->getScaledContentHeight() });
 

src/main.cpp

@@ -22,7 +22,7 @@ using namespace horrible;
         log::info("Done registering {} options", defOpts.size());
 
         defOpts.clear();
-        log::debug("Cleaned up default option copies! Now at size {}", defOpts.size());
+        log::debug("Cleaned up default option array!");
     } else {
         log::error("Failed to get OptionManager");
     };

src/menu/src/FloatingButton.cpp

@@ -124,8 +124,8 @@ bool FloatingButton::ccTouchBegan(CCTouch* touch, CCEvent* ev) {
                     CCEaseExponentialOut::create(CCScaleTo::create(0.25f, m_impl->m_scale * 0.875f)),
                     CCFadeTo::create(0.25f, 255)
                 ),
-                CCCallFunc::create(this, callfunc_selector(FloatingButton::onScaleEnd)
-                )));
+                CCCallFunc::create(this, callfunc_selector(FloatingButton::onScaleEnd))
+            ));
 
             return true; // swallow touch
         };