More fixes

Author: Alphalaneous

include/Fields.hpp

@@ -47,7 +47,7 @@ namespace alpha::utils {
 
         void* getField(size_t index);
         void* setField(size_t index, size_t size, std::function<void(void*)> destructor);
-        static ObjectFieldContainer* from(ModifyCCObject<cocos2d::CCObject>* object, char const* forClass);
+        static ObjectFieldContainer* from(cocos2d::CCObject* object, char const* forClass);
     };
 
     size_t getFieldIndexForClass(char const* name);
@@ -61,7 +61,7 @@ namespace alpha::utils {
 
         virtual ~ObjectMetadata();
 
-        static ObjectMetadata* set(ModifyCCObject<cocos2d::CCObject>* target);
+        static ObjectMetadata* set(cocos2d::CCObject* target);
 
         ObjectFieldContainer* getFieldContainer(char const* forClass);
     };
@@ -84,7 +84,7 @@ namespace alpha::utils {
         }
 
         auto self() {
-            auto object = reinterpret_cast<ModifyCCObject<cocos2d::CCObject>*>(reinterpret_cast<std::byte*>(this) - sizeof(Base));
+            auto object = reinterpret_cast<cocos2d::CCObject*>(reinterpret_cast<std::byte*>(this) - sizeof(Base));
             auto container = ObjectFieldContainer::from(object, typeid(Base).name());
 
             static size_t index = geode::modifier::getFieldIndexForClass(typeid(Base).name());

include/ModifyCCObject.hpp

@@ -17,7 +17,7 @@ namespace alpha::utils {
     struct ModifyCCObject : public Base {
 
         void setUserObject(geode::ZStringView id, cocos2d::CCObject* value) {
-            auto meta = ObjectMetadata::set(this);
+            auto meta = ObjectMetadata::set(reinterpret_cast<ModifyCCObject<cocos2d::CCObject>*>(this));
             if (value) {
                 meta->m_userObjects[id] = value;
             }
@@ -27,7 +27,7 @@ namespace alpha::utils {
         }
 
         cocos2d::CCObject* getUserObject(geode::ZStringView id) {
-            auto meta = ObjectMetadata::set(this);
+            auto meta = ObjectMetadata::set(reinterpret_cast<ModifyCCObject<cocos2d::CCObject>*>(this));
             if (meta->m_userObjects.count(id)) {
                 return meta->m_userObjects.at(id);
             }

src/Fields.cpp

@@ -28,8 +28,8 @@ void* ObjectFieldContainer::setField(size_t index, size_t size, std::function<vo
     return m_containedFields.at(index);
 }
 
-ObjectFieldContainer* ObjectFieldContainer::from(ModifyCCObject<CCObject>* object, char const* forClass) {
-    return object->getFieldContainer(forClass);
+ObjectFieldContainer* ObjectFieldContainer::from(cocos2d::CCObject* object, char const* forClass) {
+    return reinterpret_cast<ModifyCCObject<cocos2d::CCObject>*>(object)->getFieldContainer(forClass);
 }
 
 ObjectMetadata::ObjectMetadata() {}
@@ -40,18 +40,20 @@ ObjectMetadata::~ObjectMetadata() {
     }
 }
 
-ObjectMetadata* ObjectMetadata::set(ModifyCCObject<CCObject>* target) {
+ObjectMetadata* ObjectMetadata::set(cocos2d::CCObject* target) {
     if (!target) return nullptr;
 
-    auto old = target->getUserObject();
+    auto obj = reinterpret_cast<ModifyCCObject<cocos2d::CCObject>*>(target);
+
+    auto old = obj->getUserObject();
     if (old && old->getTag() == METADATA_TAG) {
         return static_cast<ObjectMetadata*>(old);
     }
     auto meta = new ObjectMetadata();
     meta->autorelease();
     meta->setTag(METADATA_TAG);
 
-    target->setUserObject(meta);
+    obj->setUserObject(meta);
     meta->retain();
 
     if (old) {