Cleanup

Author: Alphalaneous

changelog.md

@@ -1,3 +1,6 @@
+# 1.2.4
+- Cleanup on close
+
 # 1.2.3
 - Made a mistake oops, fixed
 

include/ModifyHandler.hpp

@@ -29,6 +29,7 @@ namespace alpha::utils {
         ObjectData* getObjectData(uint32_t id);
         void createObjectData(cocos2d::CCObject* object);
         void handleObject(cocos2d::CCObject* object);
+        void cleanup();
 
         template <class Base>
         inline bool containsBase(const cocos2d::CCObject* obj) {

mod.json

@@ -8,7 +8,7 @@
     },
     "id": "alphalaneous.alphas_geode_utils",
     "name": "Alpha's Geode Utils",
-    "version": "v1.2.3",
+    "version": "v1.2.4",
     "developer": "Alphalaneous",
     "description": "Miscellaneous utilities for Geode Modding",
     "api": {

src/ModifyHandler.cpp

@@ -47,12 +47,16 @@ ZStringView getObjectNameOptimized(const cocos2d::CCObject* obj) {
 #endif
 }
 
+bool g_closing = false;
+
 ModifyHandler* ModifyHandler::get() {
     static ModifyHandler handler;
     return &handler;
 }
 
 uint32_t ModifyHandler::allocateObjectData(ObjectData* data) {
+    if (g_closing) return 0;
+
     if (!m_slots.empty()) {
         auto id = m_slots.front();
         m_slots.pop();
@@ -65,20 +69,25 @@ uint32_t ModifyHandler::allocateObjectData(ObjectData* data) {
 }
 
 void ModifyHandler::releaseObjectData(uint32_t id) {
+    if (g_closing) return;
+
     if (id < m_arena.size() && m_arena[id]) {
         m_arena[id] = nullptr;
         m_slots.push(id);
     }
 }
 
 ObjectData* ModifyHandler::getObjectData(uint32_t id) {
+    if (g_closing) return nullptr;
+
     if (id < m_arena.size()) {
         return m_arena[id];
     }
     return nullptr;
 }
 
 void ModifyHandler::createObjectData(CCObject* object) {
+    if (g_closing) return;
     if (object->m_nLuaID != 0) return;
 
     ObjectData* data = new ObjectData();
@@ -87,6 +96,8 @@ void ModifyHandler::createObjectData(CCObject* object) {
 }
 
 void ModifyHandler::handleObject(CCObject* object) {
+    if (g_closing) return;
+
     createObjectData(object);    
     auto& objectsToModify = ObjectModify::get()->getObjectsToModify();
     auto it = objectsToModify.find(getObjectNameOptimized(object));
@@ -102,4 +113,13 @@ void ModifyHandler::handleObject(CCObject* object) {
             pair.method(static_cast<ModifyCCObject<CCObject>*>(object));
         }
     }
+}
+
+void ModifyHandler::cleanup() {
+    g_closing = true;
+    m_arena.clear();
+}
+
+$on_game(Exiting) {
+    ModifyHandler::get()->cleanup();
 }