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

Macro for ArraySizes and CFactory Methods are virtual now for later usage.

Browse Source
This commit is contained in:
PixieCore 2022-06-29 18:25:44 +02:00
parent c614d75a4f
commit a2cb0b62c8
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/tier0/basetypes.h
View File

@ -134,6 +134,8 @@
#endif // Max BSP file name len.
#define MAX_MAP_NAME 64
#define SDK_ARRAYSIZE(arr) ((int)(sizeof(arr) / sizeof(*arr))) // Name due to IMGUI implementation and NT implementation that we shouldn't share across everywhere.
#define SDK_VERSION "beta 1.6"/*"VGameSDK001"*/ // Increment this with every /breaking/ SDK change (i.e. security/backend changes breaking compatibility).
#ifndef DEDICATED

4
r5dev/tier1/IConVar.cpp
View File

@ -196,7 +196,7 @@ void ConVar::PurgeShipped(void) const
"voice_enabled",
};
for (int i = 0; i < (&pszToPurge)[1] - pszToPurge; i++)
for (int i = 0; i < SDK_ARRAYSIZE(pszToPurge); i++)
{
ConVar* pCVar = g_pCVar->FindVar(pszToPurge[i]);
@ -233,7 +233,7 @@ void ConVar::PurgeHostNames(void) const
"users_hostname"
};
for (int i = 0; i < (&pszHostNames)[1] - pszHostNames; i++)
for (int i = 0; i < SDK_ARRAYSIZE(pszHostNames); i++)
{
ConVar* pCVar = g_pCVar->FindVar(pszHostNames[i]);

2
r5dev/tier1/cmd.cpp
View File

@ -21,7 +21,7 @@ int CCommand::MaxCommandLength(void)
//-----------------------------------------------------------------------------
// Purpose: returns argument count
//-----------------------------------------------------------------------------
std::int64_t CCommand::ArgC(void) const
int64_t CCommand::ArgC(void) const
{
return m_nArgc;
}

10
r5dev/vpc/interfaces.h
View File

@ -77,11 +77,11 @@ struct FactoryInfo
class CFactory
{
public:
void AddFactory(const string& svFactoryName, void* pFactory);
void AddFactory(FactoryInfo factoryInfo);
size_t GetVersionIndex(const string& svInterfaceName) const;
void GetFactoriesFromRegister(void);
CMemory GetFactoryPtr(const string& factoryName, bool versionLess = true) const;
virtual void AddFactory(const string& svFactoryName, void* pFactory);
virtual void AddFactory(FactoryInfo factoryInfo);
virtual size_t GetVersionIndex(const string& svInterfaceName) const;
virtual void GetFactoriesFromRegister(void);
virtual CMemory GetFactoryPtr(const string& svFactoryName, bool versionLess = true) const;
private:
vector<FactoryInfo> m_vFactories;