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: decouple imgui window procedure from main

Browse Source 
Light cleanup.
This commit is contained in:
Kawe Mazidjatari 2024-11-20 17:12:42 +01:00
parent e4dafa240e
commit f212e96a96
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/engine/sys_mainwind.cpp
View File

@ -30,8 +30,18 @@ void CGame::PlayStartupVideos(void)
//-----------------------------------------------------------------------------
LRESULT CGame::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
if (!ImguiSystem()->IsInitialized())
return CGame__WindowProc(hWnd, uMsg, wParam, lParam);
if (ImguiSystem()->IsInitialized())
ImguiWindowProc(hWnd, uMsg, wParam, lParam);
return CGame__WindowProc(hWnd, uMsg, wParam, lParam);
}
//-----------------------------------------------------------------------------
// Purpose: imgui windows procedure
//-----------------------------------------------------------------------------
LRESULT CGame::ImguiWindowProc(HWND hWnd, UINT& uMsg, WPARAM wParam, LPARAM lParam)
{
LRESULT hr = NULL;
if (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN)
{
@ -53,7 +63,7 @@ LRESULT CGame::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (g_Console.IsActivated() || g_Browser.IsActivated())
{//////////////////////////////////////////////////////////////////////////////
g_bBlockInput = true;
ImguiSystem()->MessageHandler(hWnd, uMsg, wParam, lParam);
hr = ImguiSystem()->MessageHandler(hWnd, uMsg, wParam, lParam);
switch (uMsg)
{
@ -75,7 +85,7 @@ LRESULT CGame::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
g_bBlockInput = false;
}
return CGame__WindowProc(hWnd, uMsg, wParam, lParam);
return hr;
}
//-----------------------------------------------------------------------------

3
src/engine/sys_mainwind.h
View File

@ -18,8 +18,9 @@ class CGame
{
public:
static void PlayStartupVideos(void);
static LRESULT WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
static LRESULT WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
static LRESULT ImguiWindowProc(HWND hWnd, UINT& uMsg, WPARAM wParam, LPARAM lParam);
inline HWND GetWindow() const { return m_hWindow; }
void GetWindowRect(int* const x, int* const y, int* const w, int* const h) const;