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

CBrowser: light cleanup

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-10-21 21:28:51 +02:00
parent 0f920ff602
commit b97176a04b
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
r5dev/gameui/IBrowser.cpp
View File

@ -40,10 +40,19 @@ History:
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
CBrowser::CBrowser(void) CBrowser::CBrowser(void)
: m_pszBrowserLabel("Server Browser")
, m_bActivate(false)
, m_bInitialized(false)
, m_bReclaimFocus(false)
, m_bQueryListNonRecursive(false)
, m_flFadeAlpha(0.f)
, m_HostRequestMessageColor(1.00f, 1.00f, 1.00f, 1.00f)
, m_ivHiddenServerMessageColor(0.00f, 1.00f, 0.00f, 1.00f)
, m_Style(ImGuiStyle_t::NONE)
{ {
memset(m_szServerAddressBuffer, '\0', sizeof(m_szServerAddressBuffer)); memset(m_szServerAddressBuffer, '\0', sizeof(m_szServerAddressBuffer));
memset(m_szServerEncKeyBuffer, '\0', sizeof(m_szServerEncKeyBuffer));
m_pszBrowserLabel = "Server Browser";
m_rLockedIconBlob = GetModuleResource(IDB_PNG2); m_rLockedIconBlob = GetModuleResource(IDB_PNG2);
} }
@ -52,7 +61,6 @@ CBrowser::CBrowser(void)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
CBrowser::~CBrowser(void) CBrowser::~CBrowser(void)
{ {
//delete r5net;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -563,10 +571,7 @@ void CBrowser::HostPanel(void)
void CBrowser::UpdateHostingStatus(void) void CBrowser::UpdateHostingStatus(void)
{ {
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
if (!g_pHostState || !g_pCVar) assert(g_pHostState && g_pCVar);
{
return;
}
std::lock_guard<std::mutex> l(g_pServerListManager->m_Mutex); std::lock_guard<std::mutex> l(g_pServerListManager->m_Mutex);
g_pServerListManager->m_HostingStatus = g_pServer->IsActive() ? EHostStatus_t::HOSTING : EHostStatus_t::NOT_HOSTING; // Are we hosting a server? g_pServerListManager->m_HostingStatus = g_pServer->IsActive() ? EHostStatus_t::HOSTING : EHostStatus_t::NOT_HOSTING; // Are we hosting a server?

30
r5dev/gameui/IBrowser.h
View File

@ -36,22 +36,20 @@ public:
void SetHostName(const char* pszHostName); void SetHostName(const char* pszHostName);
virtual void SetStyleVar(void); virtual void SetStyleVar(void);
const char* m_pszBrowserLabel;
const char* m_pszBrowserLabel = nullptr; bool m_bActivate;
bool m_bActivate = false;
private: private:
bool m_bInitialized = false; bool m_bInitialized;
bool m_bReclaimFocus = false; bool m_bReclaimFocus;
bool m_bQueryListNonRecursive = false; // When set, refreshes the server list once the next frame. bool m_bQueryListNonRecursive; // When set, refreshes the server list once the next frame.
char m_szServerAddressBuffer[256] = { '\0' }; char m_szServerAddressBuffer[256];
char m_szServerEncKeyBuffer[30] = { '\0' }; char m_szServerEncKeyBuffer[30];
float m_flFadeAlpha = 0.f; float m_flFadeAlpha;
ImGuiStyle_t m_Style = ImGuiStyle_t::NONE; ID3D11ShaderResourceView* m_idLockedIcon;
ID3D11ShaderResourceView* m_idLockedIcon = nullptr; MODULERESOURCE m_rLockedIconBlob;
MODULERESOURCE m_rLockedIconBlob; mutable std::mutex m_Mutex;
mutable std::mutex m_Mutex;
//////////////////// ////////////////////
// Server List // // Server List //
@ -65,14 +63,16 @@ private:
//////////////////// ////////////////////
string m_svHostRequestMessage; string m_svHostRequestMessage;
string m_svHostToken; string m_svHostToken;
ImVec4 m_HostRequestMessageColor = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); ImVec4 m_HostRequestMessageColor;
//////////////////// ////////////////////
// Private Server // // Private Server //
//////////////////// ////////////////////
string m_svHiddenServerToken; string m_svHiddenServerToken;
string m_svHiddenServerRequestMessage; string m_svHiddenServerRequestMessage;
ImVec4 m_ivHiddenServerMessageColor = ImVec4(0.00f, 1.00f, 0.00f, 1.00f); ImVec4 m_ivHiddenServerMessageColor;
ImGuiStyle_t m_Style;
}; };
extern CBrowser* g_pBrowser; extern CBrowser* g_pBrowser;