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

Create cvar for global banned list queries

Browse Source 
This was planned to be changed a long time ago. This change allows dedicated server users to disable the logic as well.
This commit is contained in:
Kawe Mazidjatari 2023-01-26 21:20:11 +01:00
parent 3cd7f4331d
commit 61684ddf87
7 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
r5dev/engine/server/server.cpp
View File

@ -95,7 +95,7 @@ bool CServer::AuthClient(user_creds_s* pChallenge)
}
}
if (g_bCheckCompBanDB)
if (sv_globalBanlist->GetBool())
{
std::thread th(SV_IsClientBanned, string(pszAddresBuffer), nNucleusID);
th.detach();
@ -160,5 +160,4 @@ void VServer::Detach() const
}
///////////////////////////////////////////////////////////////////////////////
bool g_bCheckCompBanDB = true; // Maybe make this a static method in CServer? It won't be added to the struct offsets then.
CServer* g_pServer = nullptr;

2
r5dev/engine/server/server.h
View File

@ -93,8 +93,6 @@ inline auto v_CServer_ConnectClient = p_CServer_Authenticate.RCast<CClient* (*)(
inline CMemory p_CServer_RejectConnection;
inline auto v_CServer_RejectConnection = p_CServer_RejectConnection.RCast<void* (*)(CServer* pServer, int iSocket, v_netadr_t* pNetAdr, const char* szMessage)>();
extern bool g_bCheckCompBanDB;
///////////////////////////////////////////////////////////////////////////////
class VServer : public IDetour
{

7
r5dev/gameui/IBrowser.cpp
View File

@ -46,6 +46,7 @@ CBrowser::CBrowser(void)
, m_bInitialized(false)
, m_bReclaimFocus(false)
, m_bQueryListNonRecursive(false)
, m_bQueryGlobalBanList(true)
, m_flFadeAlpha(0.f)
, m_HostRequestMessageColor(1.00f, 1.00f, 1.00f, 1.00f)
, m_ivHiddenServerMessageColor(0.00f, 1.00f, 0.00f, 1.00f)
@ -459,7 +460,11 @@ void CBrowser::HostPanel(void)
ImGui::EndCombo();
}
ImGui::Checkbox("Load Global Ban List", &g_bCheckCompBanDB);
if (ImGui::Checkbox("Load Global Ban List", &m_bQueryGlobalBanList))
{
sv_globalBanlist->SetValue(m_bQueryGlobalBanList);
}
ImGui::Spacing();
ImGui::SameLine();

1
r5dev/gameui/IBrowser.h
View File

@ -43,6 +43,7 @@ private:
bool m_bInitialized;
bool m_bReclaimFocus;
bool m_bQueryListNonRecursive; // When set, refreshes the server list once the next frame.
bool m_bQueryGlobalBanList;
char m_szServerAddressBuffer[256];
char m_szServerEncKeyBuffer[30];
float m_flFadeAlpha;

1
r5dev/tier1/IConVar.cpp
View File

@ -102,6 +102,7 @@ void ConVar::Init(void)
navmesh_draw_poly_bounds_inner = ConVar::Create("navmesh_draw_poly_bounds_inner" , "0" , FCVAR_DEVELOPMENTONLY, "Draws the inner bounds of the NavMesh polys (requires navmesh_draw_poly_bounds).", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount");
#endif // !DEDICATED
sv_showconnecting = ConVar::Create("sv_showconnecting" , "1", FCVAR_RELEASE, "Logs information about the connecting client to the console.", false, 0.f, false, 0.f, nullptr, nullptr);
sv_globalBanlist = ConVar::Create("sv_globalBanlist" , "1", FCVAR_RELEASE, "Determines whether or not to use the global banned list.", false, 0.f, false, 0.f, nullptr, "0 = Disable, 1 = Enable.");
sv_pylonVisibility = ConVar::Create("sv_pylonVisibility", "0", FCVAR_RELEASE, "Determines the visibility to the Pylon master server.", false, 0.f, false, 0.f, nullptr, "0 = Offline, 1 = Hidden, 2 = Public.");
sv_pylonRefreshRate = ConVar::Create("sv_pylonRefreshRate" , "5.0", FCVAR_RELEASE, "Pylon host refresh rate (seconds).", true, 2.f, true, 8.f, nullptr, nullptr);
sv_banlistRefreshRate = ConVar::Create("sv_banlistRefreshRate", "1.0", FCVAR_RELEASE, "Banned list refresh rate (seconds).", true, 1.f, false, 0.f, nullptr, nullptr);

1
r5dev/tier1/cvar.cpp
View File

@ -72,6 +72,7 @@ ConVar* navmesh_draw_poly_bounds_inner = nullptr;
#endif // !DEDICATED
ConVar* sv_showconnecting = nullptr;
ConVar* sv_globalBanlist = nullptr;
ConVar* sv_pylonVisibility = nullptr;
ConVar* sv_pylonRefreshRate = nullptr;
ConVar* sv_banlistRefreshRate = nullptr;

1
r5dev/tier1/cvar.h
View File

@ -68,6 +68,7 @@ extern ConVar* navmesh_draw_poly_bounds;
extern ConVar* navmesh_draw_poly_bounds_inner;
#endif // DEDICATED
extern ConVar* sv_showconnecting;
extern ConVar* sv_globalBanlist;
extern ConVar* sv_pylonVisibility;
extern ConVar* sv_pylonRefreshRate;
extern ConVar* sv_banlistRefreshRate;