bug fix

Author: Alphalaneous

changelog.md

@@ -1,3 +1,7 @@
+## 1.9.2
+- Fix a memory leak when setting a font file on a CCLabelBMFont
+- Remove batch node hack :P
+
 ## 1.9.1
 - Fix a crash with labels
 - Revamp Texture Loader pack nodes

mod.json

@@ -5,7 +5,7 @@
         "android": "2.2074",
         "mac": "2.2074"
     },
-    "version": "v1.9.1",
+    "version": "v1.9.2",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",

src/Config.h

@@ -8,7 +8,6 @@ class Config {
     protected:
     static Config* instance;
     public:
-    bool m_batchNodesEnabled = true;
     std::unordered_map<std::string, std::vector<matjson::Value>> m_packSettings;
 
     std::optional<matjson::Value> loadIntoJson(geode::texture_loader::Pack pack) {
@@ -58,7 +57,7 @@ class Config {
     }
 
     void loadConfig(geode::texture_loader::Pack pack, matjson::Value config) {
-        if (m_batchNodesEnabled) m_batchNodesEnabled = config["batch-nodes"].asBool().unwrapOr(true);
+        
         loadSettings(pack, config);
     }
 

src/UIModding.cpp

@@ -661,8 +661,7 @@ void UIModding::setFont(CCNode* node, matjson::Value attributes) {
                 if (utils::string::endsWith(font, ".fnt")) {
                     MyCCLabelBMFont* myTextObject = static_cast<MyCCLabelBMFont*>(textObject);
 
-                    CCLabelBMFont* dummyTextObject = CCLabelBMFont::create("", font.c_str());
-                    if (dummyTextObject) {
+                    if (FNTConfigLoadFile(font.c_str())) {
                         textObject->setFntFile(font.c_str());
 
                         if (myTextObject->m_fields->m_isLimited) {
@@ -1008,9 +1007,7 @@ void UIModding::setSprite(CCNode* node, matjson::Value attributes) {
                                 CCSprite* spr = Utils::getValidSprite(texture.c_str());
                                 if (!spr) return;
 
-                                CCLabelBMFont* fnt = CCLabelBMFont::create("", font.c_str());
-
-                                if (spr && fnt) {
+                                if (FNTConfigLoadFile(font.c_str())) {
                                     auto buttonSprite = ButtonSprite::create(caption.c_str(), width, absolute, font.c_str(), texture.c_str(), height, scale);
                                     buttonNode->setNormalImage(buttonSprite);
                                     Utils::updateSprite(buttonNode);

src/main.cpp

@@ -25,7 +25,6 @@
 #include "nodes/GJGarageLayer.h"
 #include "nodes/CCNode.h"
 #include "nodes/CCSprite.h"
-#include "nodes/CCSpriteBatchNode.h"
 #include "nodes/CCDirector.h"
 #include "NodeModding.h"
 #include "BackgroundColors.h"

src/nodes/CCLabelBMFont.h

@@ -94,16 +94,15 @@ class $modify(MyCCLabelBMFont, CCLabelBMFont) {
     }
 
     void checkParent(float dt) {
-        
-        if (auto parent = this->getParent()) {
+        if (auto parent = getParent()) {
             if (typeinfo_cast<LabelGameObject*>(parent)) {
-                if (strcmp(this->getFntFile(), "bigFont.fnt") == 0) {
-                    ccBlendFunc blendFunc = this->getBlendFunc();
-                    this->setFntFile("bigFont.fnt"_spr);
-                    this->setBlendFunc(blendFunc);
+                if (std::string_view(getFntFile()) == "bigFont.fnt") {
+                    ccBlendFunc blendFunc = getBlendFunc();
+                    setFntFile("bigFont.fnt"_spr);
+                    setBlendFunc(blendFunc);
                 }
             }
-            this->unschedule(m_fields->m_schedule);
+            unschedule(m_fields->m_schedule);
         }
     }
 };