From e97b96b536f2f04ebf6f3e61e4768b5af1939e07 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 9 Apr 2022 01:06:03 +0900 Subject: [PATCH] Remove some long dead cvars The declarations were still around, but the creation and code using them was removed long ago. --- include/QF/input.h | 1 - include/d_local.h | 2 -- include/r_cvar.h | 4 ---- include/r_local.h | 1 - include/snd_internal.h | 4 ---- libs/audio/renderer/snd_dma.c | 1 + libs/video/renderer/gl/vid_common_gl.c | 4 ---- nq/include/client.h | 4 ---- qw/include/cl_main.h | 1 - qw/include/client.h | 2 -- qw/source/cl_skin.c | 2 +- 11 files changed, 2 insertions(+), 24 deletions(-) diff --git a/include/QF/input.h b/include/QF/input.h index ade3b97d0..119ad170b 100644 --- a/include/QF/input.h +++ b/include/QF/input.h @@ -129,7 +129,6 @@ void IN_ClearStates (void); extern struct cvar_s *in_grab; extern struct cvar_s *in_amp; extern struct cvar_s *in_pre_amp; -extern struct cvar_s *m_filter; extern struct cvar_s *in_mouse_accel; extern struct cvar_s *in_freelook; extern struct cvar_s *lookstrafe; diff --git a/include/d_local.h b/include/d_local.h index 51a2cd220..7b9cc3fac 100644 --- a/include/d_local.h +++ b/include/d_local.h @@ -63,8 +63,6 @@ typedef struct sspan_s { int u, v, count; } sspan_t; -extern struct cvar_s *d_subdiv16; - extern float scale_for_mip; extern qboolean d_roverwrapped; diff --git a/include/r_cvar.h b/include/r_cvar.h index 5b1090c1d..756c2ef03 100644 --- a/include/r_cvar.h +++ b/include/r_cvar.h @@ -59,9 +59,7 @@ extern struct cvar_s *r_explosionclip; extern struct cvar_s *r_farclip; extern struct cvar_s *r_firecolor; extern struct cvar_s *r_flatlightstyles; -extern struct cvar_s *r_fullbright; extern struct cvar_s *r_graphheight; -extern struct cvar_s *r_lightmap; extern struct cvar_s *r_lightmap_components; extern struct cvar_s *r_maxedges; extern struct cvar_s *r_maxsurfs; @@ -85,8 +83,6 @@ extern struct cvar_s *r_waterripple; extern struct cvar_s *r_waterwarp; extern struct cvar_s *r_zgraph; -extern struct cvar_s *scr_consize; -extern struct cvar_s *scr_conspeed; extern struct cvar_s *scr_fov; extern struct cvar_s *scr_fisheye; extern struct cvar_s *scr_fviews; diff --git a/include/r_local.h b/include/r_local.h index e6a068501..ef0db6963 100644 --- a/include/r_local.h +++ b/include/r_local.h @@ -71,7 +71,6 @@ extern struct cvar_s *r_timegraph; extern struct cvar_s *r_graphheight; extern struct cvar_s *r_clearcolor; extern struct cvar_s *r_waterwarp; -extern struct cvar_s *r_fullbright; extern struct cvar_s *r_drawentities; extern struct cvar_s *r_aliasstats; extern struct cvar_s *r_dspeeds; diff --git a/include/snd_internal.h b/include/snd_internal.h index 8d95d0615..078d32cbb 100644 --- a/include/snd_internal.h +++ b/include/snd_internal.h @@ -229,12 +229,8 @@ struct channel_s { //@} }; -extern struct cvar_s *snd_loadas8bit; extern struct cvar_s *snd_volume; -extern struct cvar_s *snd_interp; -extern struct cvar_s *snd_stereo_phase_separation; - extern snd_render_data_t snd_render_data; #define PAINTBUFFER_SIZE 512 extern portable_samplepair_t snd_paintbuffer[PAINTBUFFER_SIZE * 2]; diff --git a/libs/audio/renderer/snd_dma.c b/libs/audio/renderer/snd_dma.c index ecf5b2707..010793cae 100644 --- a/libs/audio/renderer/snd_dma.c +++ b/libs/audio/renderer/snd_dma.c @@ -345,6 +345,7 @@ s_init (void) "fix permanently blocked sound"); // FIXME +//extern struct cvar_s *snd_loadas8bit; // if (host_parms.memsize < 0x800000) { // Cvar_Set (snd_loadas8bit, "1"); // Sys_Printf ("loading all sounds as 8bit\n"); diff --git a/libs/video/renderer/gl/vid_common_gl.c b/libs/video/renderer/gl/vid_common_gl.c index d1547d2d9..e0e5f5231 100644 --- a/libs/video/renderer/gl/vid_common_gl.c +++ b/libs/video/renderer/gl/vid_common_gl.c @@ -113,7 +113,6 @@ int gl_tess; int gl_max_lights; cvar_t *gl_anisotropy; -cvar_t *gl_doublebright; cvar_t *gl_fb_bmodels; cvar_t *gl_finish; cvar_t *gl_max_size; @@ -485,9 +484,6 @@ CheckCombineExtensions (void) "doublebright enabled.\n"); } else { gl_combine_capable = false; - Sys_MaskPrintf (SYS_vid, "GL_ARB_texture_env_combine not found. " - "gl_doublebright will have no effect with " - "gl_multitexture on.\n"); } } diff --git a/nq/include/client.h b/nq/include/client.h index 4e5c148e8..de0e7cb02 100644 --- a/nq/include/client.h +++ b/nq/include/client.h @@ -213,13 +213,9 @@ typedef struct client_state_s { extern struct cvar_s *cl_name; extern struct cvar_s *cl_color; -extern struct cvar_s *cl_autofire; - extern struct cvar_s *cl_shownet; extern struct cvar_s *cl_nolerp; -extern struct cvar_s *cl_pitchdriftspeed; - extern struct cvar_s *cl_name; extern struct cvar_s *cl_writecfg; diff --git a/qw/include/cl_main.h b/qw/include/cl_main.h index 640c206cc..61d9d0481 100644 --- a/qw/include/cl_main.h +++ b/qw/include/cl_main.h @@ -52,7 +52,6 @@ void CL_BeginServerConnect(void); #define soundlist_name "soundlist %i %i" -extern struct cvar_s *cl_timeframes; extern struct cvar_s *cl_predict_players; extern struct cvar_s *cl_solid_players; extern struct cvar_s *cl_autoexec; diff --git a/qw/include/client.h b/qw/include/client.h index dbd0f35d0..876bc6cca 100644 --- a/qw/include/client.h +++ b/qw/include/client.h @@ -265,8 +265,6 @@ extern struct cvar_s *cl_netgraph_box; extern struct cvar_s *cl_draw_locs; extern struct cvar_s *cl_shownet; -extern struct cvar_s *cl_pitchdriftspeed; - extern struct cvar_s *cl_name; extern struct cvar_s *cl_model_crcs; diff --git a/qw/source/cl_skin.c b/qw/source/cl_skin.c index 24f2a809d..6ff72805b 100644 --- a/qw/source/cl_skin.c +++ b/qw/source/cl_skin.c @@ -200,7 +200,7 @@ CL_Skin_Init (void) "shirt pants) Note that if only shirt color is given, " "pants will match"); - noskins = Cvar_Get ("noskins", "0", CVAR_ARCHIVE, NULL, //XXX FIXME + noskins = Cvar_Get ("noskins", "0", CVAR_ARCHIVE, NULL, "set to 1 to not download new skins"); skin = Cvar_Get ("skin", "", CVAR_ARCHIVE | CVAR_USERINFO, skin_f, "Players skin");