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 'ip' cvar global to avoid conflicts

Browse Source 
Avoid shadowing conflicts due to short name.
This commit is contained in:
Kawe Mazidjatari 2023-04-16 01:17:46 +02:00
parent 9287f00841
commit e0e7adbed4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/public/tier1/cvar.h
View File

@ -33,7 +33,7 @@ extern ConVar* staticProp_gather_size_weight;
extern ConVar* model_defaultFadeDistScale; extern ConVar* model_defaultFadeDistScale;
extern ConVar* model_defaultFadeDistMin; extern ConVar* model_defaultFadeDistMin;
extern ConVar* ip; extern ConVar* ip_cvar;
extern ConVar* hostname; extern ConVar* hostname;
extern ConVar* hostdesc; extern ConVar* hostdesc;
extern ConVar* hostip; extern ConVar* hostip;

4
r5dev/tier1/cvar.cpp
View File

@ -28,7 +28,7 @@ ConVar* staticProp_gather_size_weight = nullptr;
ConVar* model_defaultFadeDistScale = nullptr; ConVar* model_defaultFadeDistScale = nullptr;
ConVar* model_defaultFadeDistMin = nullptr; ConVar* model_defaultFadeDistMin = nullptr;
ConVar* ip = nullptr; ConVar* ip_cvar = nullptr;
ConVar* hostname = nullptr; ConVar* hostname = nullptr;
ConVar* hostdesc = nullptr; ConVar* hostdesc = nullptr;
ConVar* hostip = nullptr; ConVar* hostip = nullptr;
@ -505,7 +505,7 @@ void ConVar::InitShipped(void)
origin_disconnectWhenOffline = g_pCVar->FindVar("origin_disconnectWhenOffline"); origin_disconnectWhenOffline = g_pCVar->FindVar("origin_disconnectWhenOffline");
#endif // !DEDICATED #endif // !DEDICATED
mp_gamemode = g_pCVar->FindVar("mp_gamemode"); mp_gamemode = g_pCVar->FindVar("mp_gamemode");
ip = g_pCVar->FindVar("ip"); ip_cvar = g_pCVar->FindVar("ip");
hostname = g_pCVar->FindVar("hostname"); hostname = g_pCVar->FindVar("hostname");
hostip = g_pCVar->FindVar("hostip"); hostip = g_pCVar->FindVar("hostip");
hostport = g_pCVar->FindVar("hostport"); hostport = g_pCVar->FindVar("hostport");