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

Rename static 'Init' method in ConVar

Browse Source 
Renamed to 'StaticInit' to avoid base class override. Also commented '__restrict' qualifiers.
This commit is contained in:
Kawe Mazidjatari 2023-04-01 13:09:02 +02:00
parent 2be8c69d6d
commit 69e6c4718e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/core/init.cpp
View File

@ -183,7 +183,7 @@ void Systems_Init()
spdlog::info("{:16s} '{:10.6f}' seconds ('{:12d}' clocks)\n", "Detour->Attach()", initTimer.GetDuration().GetSeconds(), initTimer.GetDuration().GetCycles());
spdlog::info("+-------------------------------------------------------------+\n");
ConVar::Init();
ConVar::StaticInit();
}
//////////////////////////////////////////////////////////////////////////

10
r5dev/tier1/cvar.cpp
View File

@ -289,7 +289,7 @@ ConVar::ConVar(void)
//-----------------------------------------------------------------------------
// Purpose: initialize ConVar's
//-----------------------------------------------------------------------------
void ConVar::Init(void)
void ConVar::StaticInit(void)
{
//-------------------------------------------------------------------------
// ENGINE |
@ -1683,9 +1683,9 @@ CConCommandHash::CCommandHashHandle_t CConCommandHash::FastInsert(ConCommandBase
//-----------------------------------------------------------------------------
// Purpose: Remove a given element from the hash.
//-----------------------------------------------------------------------------
void CConCommandHash::Remove(CCommandHashHandle_t hHash) RESTRICT
void CConCommandHash::Remove(CCommandHashHandle_t hHash) /*RESTRICT*/
{
HashEntry_t* RESTRICT entry = &m_aDataPool[hHash];
HashEntry_t* /*RESTRICT*/ entry = &m_aDataPool[hHash];
HashKey_t iBucket = entry->m_uiKey & kBUCKETMASK;
if (m_aBuckets[iBucket] == hHash)
{
@ -1714,7 +1714,7 @@ void CConCommandHash::RemoveAll(void)
//-----------------------------------------------------------------------------
// Find hash entry corresponding to a string name
//-----------------------------------------------------------------------------
CConCommandHash::CCommandHashHandle_t CConCommandHash::Find(const char* name, HashKey_t hashkey) const RESTRICT
CConCommandHash::CCommandHashHandle_t CConCommandHash::Find(const char* name, HashKey_t hashkey) const /*RESTRICT*/
{
// hash the "key" - get the correct hash table "bucket"
int iBucket = hashkey & kBUCKETMASK;
@ -1736,7 +1736,7 @@ CConCommandHash::CCommandHashHandle_t CConCommandHash::Find(const char* name, Ha
//-----------------------------------------------------------------------------
// Find a command in the hash.
//-----------------------------------------------------------------------------
CConCommandHash::CCommandHashHandle_t CConCommandHash::Find(const ConCommandBase* cmd) const RESTRICT
CConCommandHash::CCommandHashHandle_t CConCommandHash::Find(const ConCommandBase* cmd) const /*RESTRICT*/
{
// Set this #if to 1 if the assert at bottom starts whining --
// that indicates that a console command is being double-registered,

2
r5dev/tier1/cvar.h
View File

@ -354,7 +354,7 @@ public:
ConVar(void);
virtual ~ConVar(void) { };
static void Init(void);
static void StaticInit(void);
static void InitShipped(void);
static void PurgeShipped(void);