diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 999864b3..f6887ae7 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -43,7 +43,6 @@ convar_t *rcon_client_password; convar_t *rcon_address; convar_t *cl_timeout; convar_t *cl_nopred; -convar_t *cl_showfps; convar_t *cl_nodelta; convar_t *cl_crosshair; convar_t *cl_cmdbackup; @@ -2840,7 +2839,6 @@ void CL_InitLocal( void ) Cvar_Get( "team", "", FCVAR_USERINFO, "player team" ); Cvar_Get( "skin", "", FCVAR_USERINFO, "player skin" ); - cl_showfps = Cvar_Get( "cl_showfps", "1", FCVAR_ARCHIVE, "show client fps" ); cl_nosmooth = Cvar_Get( "cl_nosmooth", "0", FCVAR_ARCHIVE, "disable smooth up stair climbing and interpolate position in multiplayer" ); cl_smoothtime = Cvar_Get( "cl_smoothtime", "0", FCVAR_ARCHIVE, "time to smooth up" ); cl_cmdbackup = Cvar_Get( "cl_cmdbackup", "10", FCVAR_ARCHIVE, "how many additional history commands are sent" ); diff --git a/engine/client/cl_scrn.c b/engine/client/cl_scrn.c index 70e8acb5..62f5146f 100644 --- a/engine/client/cl_scrn.c +++ b/engine/client/cl_scrn.c @@ -27,8 +27,10 @@ convar_t *scr_viewsize; convar_t *cl_testlights; convar_t *cl_allow_levelshots; convar_t *cl_levelshot_name; -convar_t *cl_envshot_size; +static convar_t *cl_envshot_size; convar_t *v_dark; +static convar_t *net_speeds; +static convar_t *cl_showfps; typedef struct { @@ -777,6 +779,8 @@ void SCR_Init( void ) cl_envshot_size = Cvar_Get( "cl_envshot_size", "256", FCVAR_ARCHIVE, "envshot size of cube side" ); v_dark = Cvar_Get( "v_dark", "0", 0, "starts level from dark screen" ); scr_viewsize = Cvar_Get( "viewsize", "120", FCVAR_ARCHIVE, "screen size" ); + net_speeds = Cvar_Get( "net_speeds", "0", FCVAR_ARCHIVE, "show network packets" ); + cl_showfps = Cvar_Get( "cl_showfps", "1", FCVAR_ARCHIVE, "show client fps" ); // register our commands Cmd_AddCommand( "skyname", CL_SetSky_f, "set new skybox by basename" ); diff --git a/engine/client/client.h b/engine/client/client.h index cde2c275..cd805120 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -655,8 +655,6 @@ extern convar_t cl_allow_download; extern convar_t cl_allow_upload; extern convar_t cl_download_ingame; extern convar_t *cl_nopred; -extern convar_t *cl_showfps; -extern convar_t *cl_envshot_size; extern convar_t *cl_timeout; extern convar_t *cl_nodelta; extern convar_t *cl_interp; diff --git a/engine/common/net_chan.c b/engine/common/net_chan.c index 8b097959..39560f32 100644 --- a/engine/common/net_chan.c +++ b/engine/common/net_chan.c @@ -87,7 +87,6 @@ unacknowledged reliable convar_t *net_showpackets; convar_t *net_chokeloopback; convar_t *net_showdrop; -convar_t *net_speeds; convar_t *net_qport; int net_drop; @@ -252,7 +251,6 @@ void Netchan_Init( void ) net_showpackets = Cvar_Get ("net_showpackets", "0", 0, "show network packets" ); net_chokeloopback = Cvar_Get( "net_chokeloop", "0", 0, "apply bandwidth choke to loopback packets" ); net_showdrop = Cvar_Get( "net_showdrop", "0", 0, "show packets that are dropped" ); - net_speeds = Cvar_Get( "net_speeds", "0", FCVAR_ARCHIVE, "show network packets" ); net_qport = Cvar_Get( "net_qport", va( "%i", port ), FCVAR_READ_ONLY, "current quake netport" ); net_mempool = Mem_AllocPool( "Network Pool" ); diff --git a/engine/common/netchan.h b/engine/common/netchan.h index 3980090e..f3205795 100644 --- a/engine/common/netchan.h +++ b/engine/common/netchan.h @@ -282,7 +282,6 @@ extern netadr_t net_from; extern netadr_t net_local; extern sizebuf_t net_message; extern byte net_message_buffer[NET_MAX_MESSAGE]; -extern convar_t *net_speeds; extern convar_t sv_lan; extern convar_t sv_lan_rate; extern int net_drop;