Fix overrides

maximegmd · Dec 6, 2023 · 15ebd8b · 15ebd8b
1 parent bcbd67e
commit 15ebd8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/scripting/FunctionOverride.cpp b/src/scripting/FunctionOverride.cpp
@@ -617,8 +617,9 @@ void FunctionOverride::Override(
             {
                 if (pRealFunction->flags.isNative)
                 {
-                    pFunc = RED4ext::CClassStaticFunction::Create(pClassType, acFullName.c_str(), acFullName.c_str(), pExecutablePayload, pRealFunction->flags);
-                    reinterpret_cast<RED4ext::CClassStaticFunction*>(pFunc)->parent = pRealFunction->parent;
+                    auto* pResult = RED4ext::CClassStaticFunction::Create(pClassType, acFullName.c_str(), acFullName.c_str(), pExecutablePayload, pRealFunction->flags);
+                    pResult->parent = pRealFunction->parent;
+                    pFunc = pResult;
                 }
                 else
                 {
@@ -627,8 +628,9 @@ void FunctionOverride::Override(
             }
             else
             {
-                pFunc = RED4ext::CClassFunction::Create(pClassType, acFullName.c_str(), acFullName.c_str(), pExecutablePayload, pRealFunction->flags);
-                reinterpret_cast<RED4ext::CClassFunction*>(pFunc)->parent = pRealFunction->parent;
+                auto* pResult = RED4ext::CClassFunction::Create(pClassType, acFullName.c_str(), acFullName.c_str(), pExecutablePayload, pRealFunction->flags);
+                pResult->parent = pRealFunction->parent;
+                pFunc = pResult;
             }
 
             CopyFunctionDescription(pFunc, pRealFunction, true);

diff --git a/vendor/RED4ext.SDK b/vendor/RED4ext.SDK
+1 −1		.github/workflows/build.yml
+11 −20		.github/workflows/clang-format.yml
+4 −1		examples/accessing_properties/Main.cpp
+4 −1		examples/execute_functions/Main.cpp
+4 −1		examples/function_registration/Main.cpp
+4 −1		examples/native_class_redscript/Main.cpp
+4 −1		examples/native_globals_redscript/Main.cpp
+8 −8		include/RED4ext/Addresses.hpp
+2 −2		include/RED4ext/GameEngine.hpp
+4 −0		include/RED4ext/Scripting/Natives/gameIGameSystem-inl.hpp
+3 −2		include/RED4ext/Scripting/Natives/gameIGameSystem.hpp
+9 −9		scripts/patterns.py