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

Add CHostState::Think ConVar's and new method to return double value

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-03-27 11:42:24 +02:00
parent 3d90d1cbfb
commit 4a5823023d
5 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r5dev/engine/host_state.cpp
View File

@ -196,19 +196,19 @@ FORCEINLINE void CHostState::Think(void) const
bInitialized = true;
}
if (banListTimer.GetDurationInProgress().GetSeconds() > 1.0)
if (banListTimer.GetDurationInProgress().GetSeconds() > sv_banlistRefreshInterval->GetDouble())
{
g_pBanSystem->BanListCheck();
banListTimer.Start();
}
#ifdef DEDICATED
if (pylonTimer.GetDurationInProgress().GetSeconds() > 5.0)
if (pylonTimer.GetDurationInProgress().GetSeconds() > sv_pylonRefreshInterval->GetDouble())
{
KeepAliveToPylon();
pylonTimer.Start();
}
#endif // DEDICATED
if (statsTimer.GetDurationInProgress().GetSeconds() > 1.0)
if (statsTimer.GetDurationInProgress().GetSeconds() > sv_statusRefreshInterval->GetDouble())
{
std::string svCurrentPlaylist = KeyValues_GetCurrentPlaylist();
std::int64_t nPlayerCount = g_pServer->GetNumHumanPlayers();

35
r5dev/tier0/IConVar.cpp
View File

@ -60,7 +60,9 @@ void ConVar::Init(void) const
sv_showconnecting = new ConVar("sv_showconnecting" , "1", FCVAR_RELEASE, "Logs information about the connecting client to the console.", false, 0.f, false, 0.f, nullptr, nullptr);
sv_pylonvisibility = new ConVar("sv_pylonvisibility", "0", FCVAR_RELEASE, "Determines the visiblity to the Pylon Master Server, 0 = Not visible, 1 = Visible, 2 = Hidden !TODO: not implemented yet.", false, 0.f, false, 0.f, nullptr, nullptr);
sv_pylonRefreshInterval = new ConVar("sv_pylonRefreshInterval" , "5.0", FCVAR_RELEASE, "Pylon server host request post update interval (seconds).", true, 2.f, true, 8.f, nullptr, nullptr);
sv_banlistRefreshInterval = new ConVar("sv_banlistRefreshInterval", "1.0", FCVAR_RELEASE, "Banlist refresh interval (seconds).", true, 1.f, false, 0.f, nullptr, nullptr);
sv_statusRefreshInterval = new ConVar("sv_statusRefreshInterval" , "0.5", FCVAR_RELEASE, "Server status bar update interval (seconds).", false, 0.f, false, 0.f, nullptr, nullptr);
#ifdef DEDICATED
sv_rcon_debug = new ConVar("sv_rcon_debug" , "0" , FCVAR_RELEASE, "Show rcon debug information ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);
sv_rcon_banpenalty = new ConVar("sv_rcon_banpenalty" , "10", FCVAR_RELEASE, "Number of minutes to ban users who fail rcon authentication.", false, 0.f, false, 0.f, nullptr, nullptr);
@ -211,6 +213,15 @@ float ConVar::GetFloat(void) const
return m_pParent->m_Value.m_fValue;
}
//-----------------------------------------------------------------------------
// Purpose: Return ConVar value as a double.
// Output : double
//-----------------------------------------------------------------------------
double ConVar::GetDouble(void) const
{
return static_cast<double>(m_pParent->m_Value.m_fValue);
}
//-----------------------------------------------------------------------------
// Purpose: Return ConVar value as an integer.
// Output : int
@ -226,7 +237,7 @@ int ConVar::GetInt(void) const
//-----------------------------------------------------------------------------
Color ConVar::GetColor(void) const
{
unsigned char* pColorElement = ((unsigned char*)&m_pParent->m_Value.m_nValue);
unsigned char* pColorElement = (reinterpret_cast<unsigned char*>(&m_pParent->m_Value.m_nValue));
return Color(pColorElement[0], pColorElement[1], pColorElement[2], pColorElement[3]);
}
@ -317,12 +328,12 @@ void ConVar::SetValue(int nValue)
// Only valid for root ConVars.
assert(m_pParent == this);
float flValue = (float)nValue;
float flValue = static_cast<float>(nValue);
// Check bounds.
if (ClampValue(flValue))
{
nValue = (int)(flValue);
nValue = static_cast<int>(flValue);
}
// Redetermine value.
@ -358,7 +369,7 @@ void ConVar::SetValue(float flValue)
// Redetermine value.
float flOldValue = m_Value.m_fValue;
m_Value.m_fValue = flValue;
m_Value.m_nValue = (int)m_Value.m_fValue;
m_Value.m_nValue = static_cast<int>(m_Value.m_fValue);
if (!(m_nFlags & FCVAR_NEVER_AS_STRING))
{
@ -387,7 +398,7 @@ void ConVar::SetValue(const char* pszValue)
assert(m_pParent == this);
float flOldValue = m_Value.m_fValue;
pszNewValue = (char*)pszValue;
pszNewValue = const_cast<char*>(pszValue);
if (!pszNewValue)
{
pszNewValue = "";
@ -396,7 +407,7 @@ void ConVar::SetValue(const char* pszValue)
if (!SetColorFromString(pszValue))
{
// Not a color, do the standard thing
float flNewValue = (float)atof(pszValue);
float flNewValue = static_cast<float>(atof(pszValue));
if (!IsFinite(flNewValue))
{
Warning(eDLL_T::ENGINE ,"Warning: ConVar '%s' = '%s' is infinite, clamping value.\n", GetBaseName(), pszValue);
@ -411,7 +422,7 @@ void ConVar::SetValue(const char* pszValue)
// Redetermine value
m_Value.m_fValue = flNewValue;
m_Value.m_nValue = (int)(m_Value.m_fValue);
m_Value.m_nValue = static_cast<int>(m_Value.m_fValue);
}
if (!(m_nFlags & FCVAR_NEVER_AS_STRING))
@ -477,7 +488,7 @@ void ConVar::ChangeStringValue(const char* pszTempVal, float flOldValue)
{
assert(!(m_nFlags & FCVAR_NEVER_AS_STRING));
char* pszOldValue = (char*)_malloca(m_Value.m_iStringLength);
char* pszOldValue = reinterpret_cast<char*>(_malloca(m_Value.m_iStringLength));
if (pszOldValue != NULL)
{
memcpy(pszOldValue, m_Value.m_pszString, m_Value.m_iStringLength);
@ -498,7 +509,7 @@ void ConVar::ChangeStringValue(const char* pszTempVal, float flOldValue)
m_Value.m_iStringLength = len;
}
memcpy((char*)m_Value.m_pszString, pszTempVal, len);
memcpy(const_cast<char*>(m_Value.m_pszString), pszTempVal, len);
}
else
{
@ -540,14 +551,14 @@ bool ConVar::SetColorFromString(const char* pszValue)
bColor = true;
// Stuff all the values into each byte of our int.
unsigned char* pColorElement = ((unsigned char*)&m_Value.m_nValue);
unsigned char* pColorElement = (reinterpret_cast<unsigned char*>(&m_Value.m_nValue));
pColorElement[0] = nRGBA[0];
pColorElement[1] = nRGBA[1];
pColorElement[2] = nRGBA[2];
pColorElement[3] = nRGBA[3];
// Copy that value into our float.
m_Value.m_fValue = (float)(m_Value.m_nValue);
m_Value.m_fValue = static_cast<float>(m_Value.m_nValue);
}
}

1
r5dev/tier0/IConVar.h
View File

@ -101,6 +101,7 @@ public:
bool GetBool(void) const;
float GetFloat(void) const;
double GetDouble(void) const;
int GetInt(void) const;
Color GetColor(void) const;
const char* GetString(void) const;

3
r5dev/tier0/cvar.cpp
View File

@ -19,6 +19,9 @@ ConVar* navmesh_always_reachable = nullptr;
ConVar* sv_showconnecting = nullptr;
ConVar* sv_pylonvisibility = nullptr;
ConVar* sv_pylonRefreshInterval = nullptr;
ConVar* sv_banlistRefreshInterval = nullptr;
ConVar* sv_statusRefreshInterval = nullptr;
#ifdef DEDICATED
ConVar* sv_rcon_debug = nullptr;

11
r5dev/tier0/cvar.h
View File

@ -30,6 +30,9 @@ extern ConVar* ai_dumpAINfileFromLoad;
extern ConVar* navmesh_always_reachable;
extern ConVar* sv_showconnecting;
extern ConVar* sv_pylonvisibility;
extern ConVar* sv_pylonRefreshInterval;
extern ConVar* sv_banlistRefreshInterval;
extern ConVar* sv_statusRefreshInterval;
#ifdef DEDICATED
extern ConVar* sv_rcon_debug;
extern ConVar* sv_rcon_banpenalty;
@ -105,10 +108,10 @@ extern ConVar* sq_showvmwarning;
extern ConVar* net_userandomkey;
extern ConVar* r5net_matchmaking_hostname;
extern ConVar* r5net_show_debug;
//-----------------------------------------------------------------------------
// RTECH API |
//-----------------------------------------------------------------------------
// RUI |
//-------------------------------------------------------------------------
// RTECH API |
//-------------------------------------------------------------------------
// RUI |
#ifndef DEDICATED
extern ConVar* rui_drawEnable;
#endif // !DEDICATED