Merge pull request #74 from hiimjasmine00/main

Bugfixes and index requirements

Author: lil2kki

src/InterfaceFixAndExt.cpp

@@ -154,9 +154,7 @@ class $modify(MLE_LevelPageExt, LevelPage) {
         LevelPage::updateDynamicPage(level);
 
         //REPLACE_DIFFICULTY_SPRITE really
-        if (REPLACE_DIFFICULTY_SPRITE) if (auto difficultySprite = typeinfo_cast<CCSprite*>(
-            this->getChildByIDRecursive("difficulty-sprite")
-        )) {
+        if (REPLACE_DIFFICULTY_SPRITE) if (auto difficultySprite = m_difficultySprite) {
             auto diffID = static_cast<int>(level->m_difficulty);
 
             auto sz = difficultySprite->getContentSize(); //limitNodeSize

src/Resources.cpp

@@ -157,12 +157,12 @@ class $modify(MLE_LocalLevelManager, LocalLevelManager) {
 
 #include <Geode/modify/LoadingLayer.hpp>
 class $modify(MLE_LoadingLayer, LoadingLayer) {
-    static inline int AFTER_LOADING = true;
+    static inline bool AFTER_LOADING = true;
     void reloadc(float) { LocalLevelManager::get()->init(); };
     $override bool init(bool a) {
         if (!LoadingLayer::init(a)) return false;
         this->scheduleOnce(schedule_selector(MLE_LoadingLayer::reloadc), 0.25f);
-        AFTER_LOADING = 1;
+        AFTER_LOADING = true;
         return true;
     }
 };
@@ -172,7 +172,8 @@ class $modify(MLE_MenuLayer, MenuLayer) {
     $override bool init() {
         if (!MenuLayer::init()) return false;
         //add frames form known mods
-        if (MLE_LoadingLayer::AFTER_LOADING--) {
+        if (MLE_LoadingLayer::AFTER_LOADING) {
+            MLE_LoadingLayer::AFTER_LOADING = false;
             auto freeDiffID = 10;
             auto diffFrameExists = true;
             auto diffSpriteExists = true;

src/TheDataDrivenAchievements.cpp

@@ -84,7 +84,9 @@ class $modify(MLE_AchievementManager, AchievementManager) {
         if (!THE_DATA_DRIVEN_ACHIEVEMENTS) return AchievementManager::addManualAchievements();
         if (!existsInPaths("achievements.json")) { // generate default file
             file::writeStringSafe(getMod()->getConfigDir() / "achievements.json", "{}");
-            setUserObject("is-data-file-generating"_spr, new CCObject());
+            auto object = new CCObject();
+            object->autorelease();
+            setUserObject("is-data-file-generating"_spr, object);
             AchievementManager::addManualAchievements();
             setUserObject("is-data-file-generating"_spr, nullptr);
             addManualAchievements();

src/_MainLevelsEditorMenu.hpp

@@ -409,12 +409,12 @@ class MainLevelsEditorMenu : public geode::Popup<> {
 
                                     auto body = std::stringstream();
 
-                                    body << """" "`  File:` [" + path.string() + "](file:///" + string::replace(path.string(), " ", "%20") + ")";
+                                    body << """" "`  File:` [" + string::pathToString(path) + "](file:///" + string::replace(string::pathToString(path), " ", "%20") + ")";
                                     body << "\n";
-                                    body << "\n" "`   Dir:` [" + dir.string() + "](file:///" + string::replace(dir.string(), " ", "%20") + ")";
+                                    body << "\n" "`   Dir:` [" + string::pathToString(dir) + "](file:///" + string::replace(string::pathToString(dir), " ", "%20") + ")";
                                     body << "\n";
                                     body << "\n" "```";
-                                    body << "\n" "zip tree of \"" << std::filesystem::path(path).filename().string() << "\": ";
+                                    body << "\n" "zip tree of \"" << string::pathToString(path.filename()) << "\": ";
                                     auto unzip = file::Unzip::create(string::pathToString(path));
                                     if (unzip.err()) body
                                         << "\n" "FAILED TO OPEN CREATED ZIP!"
@@ -424,7 +424,7 @@ class MainLevelsEditorMenu : public geode::Popup<> {
                                     body << "\n" "```";
                                     body << "\n";
                                     body << "\n" "```";
-                                    body << "\n" "data \"" << std::filesystem::path(path).filename().string() << "\": ";
+                                    body << "\n" "data \"" << string::pathToString(path.filename()) << "\": ";
                                     for (auto entry : dbg_json) body
                                         << "\n- " << entry.getKey().value_or("unk") + ": " << entry.dump();
                                     body << "\n" "```";