R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Engine: reversed some CGame field names

Browse Source 
Reversable thanks to the CInputSystem rebuild.
This commit is contained in:
Kawe Mazidjatari 2023-12-26 11:32:27 +01:00
parent 365448b8c7
commit 714674ae33
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/engine/sys_dll2.cpp
View File

@ -174,7 +174,7 @@ void CEngineAPI::PumpMessages()
if (in_syncRT->GetBool()) if (in_syncRT->GetBool())
(*g_fnSyncRTWithIn)(); (*g_fnSyncRTWithIn)();
g_pInputSystem->PollInputState(v_UIInputEventHandler); g_pInputSystem->PollInputState(UIEventDispatcher);
g_pGame->DispatchAllStoredGameMessages(); g_pGame->DispatchAllStoredGameMessages();
#endif // !DEDICATED #endif // !DEDICATED
} }

4
r5dev/engine/sys_mainwind.h
View File

@ -45,8 +45,8 @@ private:
int m_y; int m_y;
int m_width; int m_width;
int m_height; int m_height;
bool m_bUnk0; bool m_bPostedFirstAppEvent;
bool m_bUnk1; bool m_bPostFirstAppEvent;
bool m_bExternallySuppliedWindow; bool m_bExternallySuppliedWindow;
int m_iDesktopWidth; int m_iDesktopWidth;
int m_iDesktopHeight; int m_iDesktopHeight;

2
r5dev/public/inputsystem/InputEnums.h
View File

@ -55,6 +55,8 @@ enum InputEventType_t
IE_ButtonDoubleClicked, // m_nData contains a ButtonCode_t IE_ButtonDoubleClicked, // m_nData contains a ButtonCode_t
IE_AnalogValueChanged, // m_nData contains an AnalogCode_t, m_nData2 contains the value 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_FirstSystemEvent = 100,
IE_Quit = IE_FirstSystemEvent, IE_Quit = IE_FirstSystemEvent,
IE_ControllerInserted, // m_nData contains the controller ID IE_ControllerInserted, // m_nData contains the controller ID

6
r5dev/vgui/vgui_baseui_interface.h
View File

@ -86,7 +86,7 @@ inline void*(*CEngineVGui_RenderStart)(CMatSystemSurface* pMatSystemSurface);
inline CMemory p_CEngineVGui_RenderEnd; inline CMemory p_CEngineVGui_RenderEnd;
inline void*(*CEngineVGui_RenderEnd)(void); 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; inline CEngineVGui* g_pEngineVGui = nullptr;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -97,7 +97,7 @@ class VEngineVGui : public IDetour
LogFunAdr("CEngineVGui::Paint", p_CEngineVGui_Paint.GetPtr()); LogFunAdr("CEngineVGui::Paint", p_CEngineVGui_Paint.GetPtr());
LogFunAdr("CEngineVGui::RenderStart", p_CEngineVGui_RenderStart.GetPtr()); LogFunAdr("CEngineVGui::RenderStart", p_CEngineVGui_RenderStart.GetPtr());
LogFunAdr("CEngineVGui::RenderEnd", p_CEngineVGui_RenderEnd.GetPtr()); LogFunAdr("CEngineVGui::RenderEnd", p_CEngineVGui_RenderEnd.GetPtr());
LogFunAdr("UIInputEventHandler", reinterpret_cast<uintptr_t>(v_UIInputEventHandler)); LogFunAdr("UIEventDispatcher", reinterpret_cast<uintptr_t>(UIEventDispatcher));
LogVarAdr("g_pEngineVGui", reinterpret_cast<uintptr_t>(g_pEngineVGui)); LogVarAdr("g_pEngineVGui", reinterpret_cast<uintptr_t>(g_pEngineVGui));
} }
virtual void GetFun(void) const 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"); 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<void* (*)(void)>(); /*40 53 48 83 EC 20 48 8B 0D ?? ?? ?? ?? C6 05 ?? ?? ?? ?? ?? 48 8B 01*/ CEngineVGui_RenderEnd = p_CEngineVGui_RenderEnd.RCast<void* (*)(void)>(); /*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 virtual void GetVar(void) const
{ {