From 0ec2d6c347d2be8bca2bdef375cf13ddb9b93303 Mon Sep 17 00:00:00 2001 From: yamashi Date: Wed, 2 Feb 2022 14:22:52 +0100 Subject: [PATCH] Update red4ext --- .gitignore | 2 ++ src/reverse/RTTIExtender.cpp | 4 ++-- src/scripting/FunctionOverride.cpp | 4 ++-- vendor/RED4ext.SDK | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b594acf5..7bf9cd39 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ build/* *.asi src/CETVersion.h package/* +vs2022/* +vsxmake*/ \ No newline at end of file diff --git a/src/reverse/RTTIExtender.cpp b/src/reverse/RTTIExtender.cpp index 3dfb1e12..cd244417 100644 --- a/src/reverse/RTTIExtender.cpp +++ b/src/reverse/RTTIExtender.cpp @@ -376,7 +376,7 @@ void CreateSingleton(RED4ext::Handle apClassInstance) pGameSystem->OnSystemInitializeAsync(&systemInitParams); } - auto* pParentType = reinterpret_cast(apClassInstance->GetParentType()); + auto* pParentType = reinterpret_cast(apClassInstance->GetType()); pGameInstance->unk08.Insert(pParentType, apClassInstance); pGameInstance->unk38.PushBack(apClassInstance); @@ -390,7 +390,7 @@ void CreateSingleton(RED4ext::Handle apClassInstance) } else { - auto* pParentType = apClassInstance->GetParentType(); + auto* pParentType = apClassInstance->GetType(); pGameInstance->unk08.Insert(pParentType, apClassInstance); pGameInstance->unk48.Insert(pParentType, pType); } diff --git a/src/scripting/FunctionOverride.cpp b/src/scripting/FunctionOverride.cpp index 18ca1faf..932f56ca 100644 --- a/src/scripting/FunctionOverride.cpp +++ b/src/scripting/FunctionOverride.cpp @@ -197,12 +197,12 @@ void FunctionOverride::HandleOverridenFunction(RED4ext::IScriptable* apContext, { if (apContext->valueHolder) { - self.type = apContext->classType; + self.type = apContext->unk30; self.value = apContext; } else { - self.type = apFrame->context->classType; + self.type = apFrame->context->unk30; self.value = apFrame->context; } diff --git a/vendor/RED4ext.SDK b/vendor/RED4ext.SDK index e9a59c7e..8e95e838 160000 --- a/vendor/RED4ext.SDK +++ b/vendor/RED4ext.SDK @@ -1 +1 @@ -Subproject commit e9a59c7e39079117ab775b3c25f15e12ee820fb8 +Subproject commit 8e95e83847157ac3e99975620a8870f9faba8845