that was ub

Author: BlueWitherer

src/hooks/Achievement.cpp

@@ -8,8 +8,10 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static constexpr auto id = "achieve";
+
 inline static Option const o = {
-    "achieve",
+    id,
     "Random Achievements",
     "Randomly play the achievement sound when clicking buttons.\n<cy>Credit: Cheeseworks</c>",
     category::randoms,
@@ -18,10 +20,10 @@ inline static Option const o = {
 HORRIBLE_REGISTER_OPTION(o);
 
 class $modify(AchievementCCMenuItem, CCMenuItem) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     struct Fields {
-        int chance = options::getChance(o.id);
+        int chance = options::getChance(id);
     };
 
     void activate() {

src/hooks/Dementia.cpp

@@ -8,8 +8,10 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static constexpr auto id = "dementia";
+
 inline static Option const o = {
-    "dementia",
+    id,
     "Dementia",
     "Chance of the player randomly teleports back. This is more like player lagging to be honest!\n<cy>Credit: imdissapearinghelp</c>",
     category::misc,
@@ -18,10 +20,10 @@ inline static Option const o = {
 HORRIBLE_REGISTER_OPTION(o);
 
 class $modify(DementiaPlayerObject, PlayerObject) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     struct Fields {
-        int chance = options::getChance(o.id);
+        int chance = options::getChance(id);
 
         int lastMusicTime = 0; // last music time in milliseconds
 

src/hooks/GJBaseGameLayer/FakeCrash.cpp

@@ -7,8 +7,10 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static constexpr auto id = "fake_crash";
+
 inline static Option const o = {
-    "fake_crash",
+    id,
     "Random Fake Crash",
     "While playing a level, there's a chance your game will fake a crash.\n<cy>Credit: Timered</c>",
     category::randoms,
@@ -17,10 +19,10 @@ inline static Option const o = {
 HORRIBLE_REGISTER_OPTION(o);
 
 class $modify(FakeCrashGJBaseGameLayer, GJBaseGameLayer) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     struct Fields {
-        int m_chance = options::getChance(o.id);
+        int m_chance = options::getChance(id);
 
         float m_lastTimeWarp = LevelTools::getLastTimewarp();
         bool m_inFakeCrash = false;

src/hooks/GJBaseGameLayer/RandomNoJump.cpp

@@ -7,8 +7,10 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static constexpr auto id = "no_jump";
+
 inline static Option const o = {
-    "no_jump",
+    id,
     "Randomly Don't Jump",
     "When making an input in a level, there's a chance the player does not respond to it.\n<cy>Credit: GilanyKing12</c>",
     category::randoms,
@@ -17,10 +19,10 @@ inline static Option const o = {
 HORRIBLE_REGISTER_OPTION(o);
 
 class $modify(NoJumpGJBaseGameLayer, GJBaseGameLayer) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     struct Fields {
-        int chance = options::get(o.id);
+        int chance = options::get(id);
     };
 
     void handleButton(bool down, int button, bool isPlayer1) {

src/hooks/GJBaseGameLayer/TimewarpJump.cpp

@@ -7,8 +7,10 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static constexpr auto id = "timewarp_jump";
+
 inline static Option const o = {
-    "timewarp_jump",
+    id,
     "Timewarp Jump",
     "When you jump, there's a chance time will briefly slow down or speed up.\n<cy>Credit: KGplayerA</c>",
     category::randoms,
@@ -17,7 +19,7 @@ inline static Option const o = {
 HORRIBLE_REGISTER_OPTION(o);
 
 class $modify(TimewarpJumpGJBaseGameLayer, GJBaseGameLayer) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     void handleButton(bool down, int button, bool isPlayer1) {
         if (button == 1 && !down) {

src/hooks/Mock.cpp

@@ -11,8 +11,10 @@ using namespace horrible::prelude;
 
 namespace fs = std::filesystem; // Shortcut for std::filesystem
 
+inline static constexpr auto id = "mock";
+
 inline static Option const o = {
-    "mock",
+    id,
     "Mock your 90%+ Fail",
     "Taunts you in the main me with a screenshot of one of your 90%-99% fails.\n<cy>Credit: Wuffin</c>",
     category::misc,
@@ -26,10 +28,10 @@ inline static Option const o = {
 HORRIBLE_REGISTER_OPTION(o);
 
 class $modify(MockMenuLayer, MenuLayer) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     struct Fields {
-        int chance = options::getChance(o.id);
+        int chance = options::getChance(id);
     };
 
     bool init() {
@@ -123,7 +125,7 @@ class $modify(MockMenuLayer, MenuLayer) {
 };
 
 class $modify(MockPlayLayer, PlayLayer) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     void showNewBest(bool newReward, int orbs, int diamonds, bool demonKey, bool noRetry, bool noTitle) {
         int id = m_level->m_levelID;
@@ -162,11 +164,11 @@ class $modify(MockPlayLayer, PlayLayer) {
                         auto mockConfigUnwr = mockConfig.unwrapOr(matjson::Value());
 
                         // overwrite this field (or add it) with the percent
-                        mockConfigUnwr[utils::numToString(o.id)] = percentage;
+                        mockConfigUnwr[utils::numToString(id)] = percentage;
 
                         toWrite = mockConfigUnwr;
                     } else {
-                        toWrite = matjson::makeObject({ {utils::numToString(o.id), percentage} });
+                        toWrite = matjson::makeObject({ {utils::numToString(id), percentage} });
                     };
 
                     if (!toWrite.isNull()) {
@@ -203,7 +205,7 @@ class $modify(MockPlayLayer, PlayLayer) {
         if (mockConfig.isOk()) {
             log::debug("Clearing mock record for {}", id);
             auto mockConfigUnwr = mockConfig.unwrapOr(matjson::Value());
-            mockConfigUnwr[utils::numToString(o.id)].clear();
+            mockConfigUnwr[utils::numToString(id)].clear();
 
             auto const mockJson = file::writeToJson(mockConfigPath, mockConfigUnwr);
 

src/hooks/Placebo.cpp

@@ -8,8 +8,10 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static constexpr auto id = "placebo";
+
 inline static Option const o = {
-    "placebo",
+    id,
     "Placebo",
     "A random chance that when you start a level, all the options you have enabled are disabled, or all the options you have disabled are enabled.\n<cy>Credit: tmdXD</c>",
     category::misc,
@@ -35,7 +37,7 @@ void placeboEffect() {
 };
 
 class $modify(PlaceboLevelPage, LevelPage) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     void onPlay(CCObject * sender) {
         placeboEffect();
@@ -46,7 +48,7 @@ class $modify(PlaceboLevelPage, LevelPage) {
 };
 
 class $modify(PlaceboLevelInfoLayer, LevelInfoLayer) {
-    HORRIBLE_DELEGATE_HOOKS(o.id);
+    HORRIBLE_DELEGATE_HOOKS(id);
 
     void onPlay(CCObject * sender) {
         placeboEffect();