From 105d1ee7d9fc907ec34ebf7cfc51a8300126339b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 11 May 2001 19:33:17 +0000
Subject: [PATCH] well, that didn't last long, did it? merge r_cvar.h
---
{nq/include => include}/r_cvar.h | 8 ++++
qw/include/r_cvar.h | 75 --------------------------------
2 files changed, 8 insertions(+), 75 deletions(-)
rename {nq/include => include}/r_cvar.h (89%)
delete mode 100644 qw/include/r_cvar.h
diff --git a/nq/include/r_cvar.h b/include/r_cvar.h
similarity index 89%
rename from nq/include/r_cvar.h
rename to include/r_cvar.h
index 4e758bd01..7cb0f662f 100644
--- a/nq/include/r_cvar.h
+++ b/include/r_cvar.h
@@ -15,11 +15,15 @@ extern cvar_t *gl_conalpha;
extern cvar_t *gl_conspin;
extern cvar_t *gl_constretch;
extern cvar_t *gl_cull;
+extern cvar_t *gl_dlight_lightmap;
+extern cvar_t *gl_dlight_polyblend;
+extern cvar_t *gl_dlight_smooth;
extern cvar_t *gl_fb_bmodels;
extern cvar_t *gl_fb_models;
extern cvar_t *gl_fires;
extern cvar_t *gl_flashblend;
extern cvar_t *gl_keeptjunctions;
+extern cvar_t *gl_lerp_anim;
extern cvar_t *gl_lightmap_components;
extern cvar_t *gl_lightmode;
extern cvar_t *gl_max_size;
@@ -28,6 +32,7 @@ extern cvar_t *gl_picmip;
extern cvar_t *gl_playermip;
extern cvar_t *gl_polyblend;
extern cvar_t *gl_reporttjunctions;
+extern cvar_t *gl_sky_clip;
extern cvar_t *gl_skymultipass;
extern cvar_t *gl_smoothmodels;
extern cvar_t *gl_texsort;
@@ -51,6 +56,8 @@ extern cvar_t *r_maxedges;
extern cvar_t *r_maxsurfs;
extern cvar_t *r_mirroralpha;
extern cvar_t *r_netgraph;
+extern cvar_t *r_netgraph_alpha;
+extern cvar_t *r_netgraph_box;
extern cvar_t *r_norefresh;
extern cvar_t *r_novis;
extern cvar_t *r_numedges;
@@ -65,6 +72,7 @@ extern cvar_t *r_timegraph;
extern cvar_t *r_wateralpha;
extern cvar_t *r_waterripple;
extern cvar_t *r_waterwarp;
+extern cvar_t *r_zgraph;
extern cvar_t *scr_centertime;
extern cvar_t *scr_consize;
diff --git a/qw/include/r_cvar.h b/qw/include/r_cvar.h
deleted file mode 100644
index 9b669116e..000000000
--- a/qw/include/r_cvar.h
+++ /dev/null
@@ -1,75 +0,0 @@
-extern cvar_t *cl_crossx;
-extern cvar_t *cl_crossy;
-extern cvar_t *cl_verstring;
-extern cvar_t *crosshair;
-extern cvar_t *crosshaircolor;
-
-extern cvar_t *d_mipcap;
-extern cvar_t *d_mipscale;
-extern cvar_t *d_subdiv16;
-
-extern cvar_t *gl_affinemodels;
-extern cvar_t *gl_clear;
-extern cvar_t *gl_conalpha;
-extern cvar_t *gl_conspin;
-extern cvar_t *gl_constretch;
-extern cvar_t *gl_dlight_lightmap;
-extern cvar_t *gl_dlight_polyblend;
-extern cvar_t *gl_dlight_smooth;
-extern cvar_t *gl_fb_bmodels;
-extern cvar_t *gl_fb_models;
-extern cvar_t *gl_fires;
-extern cvar_t *gl_keeptjunctions;
-extern cvar_t *gl_lerp_anim;
-extern cvar_t *gl_lightmap_components;
-extern cvar_t *gl_lightmode;
-extern cvar_t *gl_max_size;
-extern cvar_t *gl_nocolors;
-extern cvar_t *gl_picmip;
-extern cvar_t *gl_playermip;
-extern cvar_t *gl_sky_clip;
-extern cvar_t *gl_skymultipass;
-extern cvar_t *gl_triplebuffer;
-
-extern cvar_t *r_aliasstats;
-extern cvar_t *r_aliastransadj;
-extern cvar_t *r_aliastransbase;
-extern cvar_t *r_ambient;
-extern cvar_t *r_clearcolor;
-extern cvar_t *r_drawentities;
-extern cvar_t *r_drawflat;
-extern cvar_t *r_draworder;
-extern cvar_t *r_drawviewmodel;
-extern cvar_t *r_dspeeds;
-extern cvar_t *r_dynamic;
-extern cvar_t *r_graphheight;
-extern cvar_t *r_maxedges;
-extern cvar_t *r_maxsurfs;
-extern cvar_t *r_netgraph;
-extern cvar_t *r_netgraph_alpha;
-extern cvar_t *r_netgraph_box;
-extern cvar_t *r_norefresh;
-extern cvar_t *r_novis;
-extern cvar_t *r_numedges;
-extern cvar_t *r_numsurfs;
-extern cvar_t *r_particles;
-extern cvar_t *r_reportedgeout;
-extern cvar_t *r_reportsurfout;
-extern cvar_t *r_shadows;
-extern cvar_t *r_skyname;
-extern cvar_t *r_speeds;
-extern cvar_t *r_timegraph;
-extern cvar_t *r_wateralpha;
-extern cvar_t *r_waterripple;
-extern cvar_t *r_waterwarp;
-extern cvar_t *r_zgraph;
-
-extern cvar_t *scr_centertime;
-extern cvar_t *scr_consize;
-extern cvar_t *scr_conspeed;
-extern cvar_t *scr_fov;
-extern cvar_t *scr_printspeed;
-extern cvar_t *scr_showpause;
-extern cvar_t *scr_showram;
-extern cvar_t *scr_showturtle;
-extern cvar_t *scr_viewsize;