YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-31 09:15:13 +00:00
Code Issues Projects Releases Wiki Activity

engine: don't double register rcon_password cvar

Browse Source
This commit is contained in:
Alibek Omarov 2022-12-12 08:13:24 +03:00
parent 60e7a7aa23
commit a3ef6c955c
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/client/cl_main.c
View File

@ -40,7 +40,6 @@ CVAR_DEFINE_AUTO( cl_logofile, "lambda", FCVAR_ARCHIVE, "player logo name" );
CVAR_DEFINE_AUTO( cl_logocolor, "orange", FCVAR_ARCHIVE, "player logo color" ); CVAR_DEFINE_AUTO( cl_logocolor, "orange", FCVAR_ARCHIVE, "player logo color" );
CVAR_DEFINE_AUTO( cl_logoext, "bmp", FCVAR_ARCHIVE, "temporary cvar to tell engine which logo must be packed" ); CVAR_DEFINE_AUTO( cl_logoext, "bmp", FCVAR_ARCHIVE, "temporary cvar to tell engine which logo must be packed" );
CVAR_DEFINE_AUTO( cl_test_bandwidth, "1", FCVAR_ARCHIVE, "test network bandwith before connection" ); CVAR_DEFINE_AUTO( cl_test_bandwidth, "1", FCVAR_ARCHIVE, "test network bandwith before connection" );
convar_t *rcon_client_password;
convar_t *rcon_address; convar_t *rcon_address;
convar_t *cl_timeout; convar_t *cl_timeout;
convar_t *cl_nopred; convar_t *cl_nopred;
@ -1312,7 +1311,7 @@ void CL_Rcon_f( void )
string command; string command;
int i; int i;
if( !COM_CheckString( rcon_client_password->string )) if( !COM_CheckString( rcon_password.string ))
{ {
Con_Printf( "You must set 'rcon_password' before issuing an rcon command.\n" ); Con_Printf( "You must set 'rcon_password' before issuing an rcon command.\n" );
return; return;
@ -1327,7 +1326,7 @@ void CL_Rcon_f( void )
NET_Config( true, false ); // allow remote NET_Config( true, false ); // allow remote
Q_strcat( message, "rcon " ); Q_strcat( message, "rcon " );
Q_strcat( message, rcon_client_password->string ); Q_strcat( message, rcon_password.string );
Q_strcat( message, " " ); Q_strcat( message, " " );
for( i = 1; i < Cmd_Argc(); i++ ) for( i = 1; i < Cmd_Argc(); i++ )
@ -2895,7 +2894,6 @@ void CL_InitLocal( void )
cl_charset = Cvar_Get( "cl_charset", "utf-8", FCVAR_ARCHIVE, "1-byte charset to use (iconv style)" ); cl_charset = Cvar_Get( "cl_charset", "utf-8", FCVAR_ARCHIVE, "1-byte charset to use (iconv style)" );
hud_utf8 = Cvar_Get( "hud_utf8", "0", FCVAR_ARCHIVE, "Use utf-8 encoding for hud text" ); hud_utf8 = Cvar_Get( "hud_utf8", "0", FCVAR_ARCHIVE, "Use utf-8 encoding for hud text" );
rcon_client_password = Cvar_Get( "rcon_password", "", FCVAR_PRIVILEGED, "remote control client password" );
rcon_address = Cvar_Get( "rcon_address", "", FCVAR_PRIVILEGED, "remote control address" ); rcon_address = Cvar_Get( "rcon_address", "", FCVAR_PRIVILEGED, "remote control address" );
cl_trace_messages = Cvar_Get( "cl_trace_messages", "0", FCVAR_ARCHIVE|FCVAR_CHEAT, "enable message names tracing (good for developers)"); cl_trace_messages = Cvar_Get( "cl_trace_messages", "0", FCVAR_ARCHIVE|FCVAR_CHEAT, "enable message names tracing (good for developers)");

1
engine/common/common.h
View File

@ -165,6 +165,7 @@ extern convar_t *host_framerate;
extern convar_t *host_maxfps; extern convar_t *host_maxfps;
extern convar_t sys_timescale; extern convar_t sys_timescale;
extern convar_t cl_filterstuffcmd; extern convar_t cl_filterstuffcmd;
extern convar_t rcon_password;
/* /*
============================================================== ==============================================================

1
engine/server/server.h
View File

@ -395,7 +395,6 @@ extern convar_t sv_unlag;
extern convar_t sv_maxunlag; extern convar_t sv_maxunlag;
extern convar_t sv_unlagpush; extern convar_t sv_unlagpush;
extern convar_t sv_unlagsamples; extern convar_t sv_unlagsamples;
extern convar_t rcon_password;
extern convar_t rcon_enable; extern convar_t rcon_enable;
extern convar_t sv_instancedbaseline; extern convar_t sv_instancedbaseline;
extern convar_t sv_background_freeze; extern convar_t sv_background_freeze;