From 714674ae334cf73e4657fadba664706170653e16 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Tue, 26 Dec 2023 11:32:27 +0100 Subject: [PATCH] Engine: reversed some CGame field names Reversable thanks to the CInputSystem rebuild. --- r5dev/engine/sys_dll2.cpp | 2 +- r5dev/engine/sys_mainwind.h | 4 ++-- r5dev/public/inputsystem/InputEnums.h | 2 ++ r5dev/vgui/vgui_baseui_interface.h | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/r5dev/engine/sys_dll2.cpp b/r5dev/engine/sys_dll2.cpp index 16d53421..7214af51 100644 --- a/r5dev/engine/sys_dll2.cpp +++ b/r5dev/engine/sys_dll2.cpp @@ -174,7 +174,7 @@ void CEngineAPI::PumpMessages() if (in_syncRT->GetBool()) (*g_fnSyncRTWithIn)(); - g_pInputSystem->PollInputState(v_UIInputEventHandler); + g_pInputSystem->PollInputState(UIEventDispatcher); g_pGame->DispatchAllStoredGameMessages(); #endif // !DEDICATED } diff --git a/r5dev/engine/sys_mainwind.h b/r5dev/engine/sys_mainwind.h index 9ed5a2ac..a4451beb 100644 --- a/r5dev/engine/sys_mainwind.h +++ b/r5dev/engine/sys_mainwind.h @@ -45,8 +45,8 @@ private: int m_y; int m_width; int m_height; - bool m_bUnk0; - bool m_bUnk1; + bool m_bPostedFirstAppEvent; + bool m_bPostFirstAppEvent; bool m_bExternallySuppliedWindow; int m_iDesktopWidth; int m_iDesktopHeight; diff --git a/r5dev/public/inputsystem/InputEnums.h b/r5dev/public/inputsystem/InputEnums.h index 6895d74d..dcc2f21b 100644 --- a/r5dev/public/inputsystem/InputEnums.h +++ b/r5dev/public/inputsystem/InputEnums.h @@ -55,6 +55,8 @@ enum InputEventType_t IE_ButtonDoubleClicked, // m_nData contains a ButtonCode_t IE_AnalogValueChanged, // m_nData contains an AnalogCode_t, m_nData2 contains the value + IE_Unknown8 = 8, // Unknown what this is/does, its used in [r5apex.exe+0x297722] and [r5apex.exe+0x297ACD] + IE_FirstSystemEvent = 100, IE_Quit = IE_FirstSystemEvent, IE_ControllerInserted, // m_nData contains the controller ID diff --git a/r5dev/vgui/vgui_baseui_interface.h b/r5dev/vgui/vgui_baseui_interface.h index 035f0ffd..ddeef4cc 100644 --- a/r5dev/vgui/vgui_baseui_interface.h +++ b/r5dev/vgui/vgui_baseui_interface.h @@ -86,7 +86,7 @@ inline void*(*CEngineVGui_RenderStart)(CMatSystemSurface* pMatSystemSurface); inline CMemory p_CEngineVGui_RenderEnd; inline void*(*CEngineVGui_RenderEnd)(void); -inline InputEventCallback_t v_UIInputEventHandler = nullptr; +inline InputEventCallback_t UIEventDispatcher = nullptr; // Points to 'CGame::DispatchInputEvent()' inline CEngineVGui* g_pEngineVGui = nullptr; /////////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ class VEngineVGui : public IDetour LogFunAdr("CEngineVGui::Paint", p_CEngineVGui_Paint.GetPtr()); LogFunAdr("CEngineVGui::RenderStart", p_CEngineVGui_RenderStart.GetPtr()); LogFunAdr("CEngineVGui::RenderEnd", p_CEngineVGui_RenderEnd.GetPtr()); - LogFunAdr("UIInputEventHandler", reinterpret_cast(v_UIInputEventHandler)); + LogFunAdr("UIEventDispatcher", reinterpret_cast(UIEventDispatcher)); LogVarAdr("g_pEngineVGui", reinterpret_cast(g_pEngineVGui)); } virtual void GetFun(void) const @@ -118,7 +118,7 @@ class VEngineVGui : public IDetour p_CEngineVGui_RenderEnd = g_GameDll.FindPatternSIMD("40 53 48 83 EC 20 48 8B 0D ?? ?? ?? ?? C6 05 ?? ?? ?? ?? ?? 48 8B 01"); CEngineVGui_RenderEnd = p_CEngineVGui_RenderEnd.RCast(); /*40 53 48 83 EC 20 48 8B 0D ?? ?? ?? ?? C6 05 ?? ?? ?? ?? ?? 48 8B 01*/ - g_GameDll.FindPatternSIMD("40 53 48 83 EC 40 48 63 01", v_UIInputEventHandler); + g_GameDll.FindPatternSIMD("40 53 48 83 EC 40 48 63 01", UIEventDispatcher); } virtual void GetVar(void) const {