diff --git a/src/overlay/Overlay.cpp b/src/overlay/Overlay.cpp index aa0ac2ea..873fcf88 100644 --- a/src/overlay/Overlay.cpp +++ b/src/overlay/Overlay.cpp @@ -189,7 +189,8 @@ void Overlay::Update() auto& d3d12 = CET::Get().GetD3D12(); d3d12.DelayedSetTrapInputInImGui(m_enabled); - ClipToCenter(RED4ext::CGameEngine::Get()->unkC0); + auto* pEngine = RED4ext::CGameEngine::Get(); + ClipToCenter(pEngine->unkC0); m_toggled = false; } } diff --git a/src/overlay/widgets/TweakDBEditor.cpp b/src/overlay/widgets/TweakDBEditor.cpp index 44af65d1..5c45ff82 100644 --- a/src/overlay/widgets/TweakDBEditor.cpp +++ b/src/overlay/widgets/TweakDBEditor.cpp @@ -14,6 +14,8 @@ #include #include +#include "RED4ext/Scripting/Utils.hpp" + bool TweakDBEditor::s_recordsFilterIsRegex = false; bool TweakDBEditor::s_flatsFilterIsRegex = false; char TweakDBEditor::s_recordsFilterBuffer[256]{}; diff --git a/src/reverse/RTTIExtender.cpp b/src/reverse/RTTIExtender.cpp index f33cfc43..c8f522bc 100644 --- a/src/reverse/RTTIExtender.cpp +++ b/src/reverse/RTTIExtender.cpp @@ -6,6 +6,8 @@ #include #include +#include "RED4ext/Scripting/Utils.hpp" + template struct GameCall { GameCall(uintptr_t aAddress, const int32_t acOffset = 0) diff --git a/src/scripting/LuaVM_Hooks.cpp b/src/scripting/LuaVM_Hooks.cpp index d16d864b..a0ac5cbf 100644 --- a/src/scripting/LuaVM_Hooks.cpp +++ b/src/scripting/LuaVM_Hooks.cpp @@ -309,25 +309,13 @@ void LuaVM::HookTDBIDToStringDEBUG(RED4ext::IScriptable*, RED4ext::CStackFrame* } } -uintptr_t LuaVM::HookSetLoadingState(uintptr_t aThis, int aState) -{ - static std::once_flag s_initBarrier; - - if (aState == 2) - { - // std::call_once(s_initBarrier, [] { s_vm->PostInitializeMods(); }); - } - - return s_vm->m_realSetLoadingState(aThis, aState); -} - bool LuaVM::HookTranslateBytecode(uintptr_t aBinder, uintptr_t aData) { const auto ret = s_vm->m_realTranslateBytecode(aBinder, aData); if (ret) { - // s_vm->PostInitializeScripting(); + s_vm->PostInitializeScripting(); } return ret; @@ -337,8 +325,8 @@ uint64_t LuaVM::HookPlayerSpawned(uint64_t a1, uint64_t a2, uint64_t a3, uint64_ { const auto ret = s_vm->m_realPlayerSpawned(a1, a2, a3, a4); - //if (!s_vm->m_initialized) - // s_vm->PostInitializeMods(); + if (!s_vm->m_initialized) + s_vm->PostInitializeMods(); return ret; } diff --git a/vendor/RED4ext.SDK b/vendor/RED4ext.SDK index 31e70f4f..3fb57859 160000 --- a/vendor/RED4ext.SDK +++ b/vendor/RED4ext.SDK @@ -1 +1 @@ -Subproject commit 31e70f4fd7459d53eeb0dcb76f4116219b845a00 +Subproject commit 3fb57859a58ae778f1c504f8b159cf7ac0261aed