This should fix up the last of the show stoppers from the cvar merge.

Fixes -glx and -3dfx.

common/gl_rmisc.c

@@ -188,69 +188,42 @@ void R_Init (void)
 	Cmd_AddCommand ("envmap", R_Envmap_f);	
 	Cmd_AddCommand ("pointfile", R_ReadPointFile_f);	
 
-//	Cvar_RegisterVariable (&r_norefresh);
 	r_norefresh = Cvar_Get ("r_norefresh","0",0,"None");
-//	Cvar_RegisterVariable (&r_lightmap);
 	r_lightmap = Cvar_Get ("r_lightmap","0",0,"None");
-//	Cvar_RegisterVariable (&r_fullbright);
 	r_fullbright = Cvar_Get ("r_fullbright","0",0,"None");
-//	Cvar_RegisterVariable (&r_drawentities);
 	r_drawentities = Cvar_Get ("r_drawentities","1",0,"None");
-//	Cvar_RegisterVariable (&r_drawviewmodel);
 	r_drawviewmodel = Cvar_Get ("r_drawviewmodel","1",0,"None");
-//	Cvar_RegisterVariable (&r_shadows);
 	r_shadows = Cvar_Get ("r_shadows","0",0,"None");
-//	Cvar_RegisterVariable (&r_wateralpha);
 	r_wateralpha = Cvar_Get ("r_wateralpha","1",0,"None");
-//	Cvar_RegisterVariable (&r_dynamic);
 	r_dynamic = Cvar_Get ("r_dynamic","1",0,"None");
-//	Cvar_RegisterVariable (&r_novis);
 	r_novis = Cvar_Get ("r_novis","0",0,"None");
-//	Cvar_RegisterVariable (&r_speeds);
 	r_speeds = Cvar_Get ("r_speeds","0",0,"None");
 #ifdef QUAKEWORLD
-//	Cvar_RegisterVariable (&r_netgraph);
 	r_netgraph = Cvar_Get ("r_netgraph","0",0,"None");
 #endif /* QUAKEWORLD */
-//	Cvar_RegisterVariable (&r_fog);
 	r_fog = Cvar_Get ("r_fog","0",0,"None");
-//	Cvar_RegisterVariable (&r_waterwarp);
 	r_waterwarp = Cvar_Get ("r_waterwarp","0",0,"None");
 #ifdef _EXPERIMENTAL_
-//	Cvar_RegisterVariable (&r_volfog);
 	r_volfog = Cvar_Get ("r_volfog","0",0,"None");
 #endif
-//	Cvar_RegisterVariable (&r_waterripple);
 	r_waterripple = Cvar_Get ("r_waterripple","0",0,"None");
-//	Cvar_RegisterVariable (&r_clearcolor);
 	r_clearcolor = Cvar_Get ("r_clearcolor","2",0,"None");
 
-//	Cvar_RegisterVariable (&gl_clear);
 	gl_clear = Cvar_Get ("gl_clear","0",0,"None");
-//	Cvar_RegisterVariable (&gl_texsort);
 	gl_texsort = Cvar_Get ("gl_texsort","1",0,"None");
 
  	if (gl_mtexable)
 		gl_texsort->value = 0.0;
 
-//	Cvar_RegisterVariable (&gl_cull);
 	gl_cull = Cvar_Get ("gl_cull","1",0,"None");
-//	Cvar_RegisterVariable (&gl_smoothmodels);
 	gl_smoothmodels = Cvar_Get ("gl_smoothmodels","1",0,"None");
-//	Cvar_RegisterVariable (&gl_affinemodels);
 	gl_affinemodels = Cvar_Get ("gl_affinemodels","0",0,"None");
-//	Cvar_RegisterVariable (&gl_polyblend);
 	gl_polyblend = Cvar_Get ("gl_polyblend","1",0,"None");
-//	Cvar_RegisterVariable (&gl_flashblend);
 	gl_flashblend = Cvar_Get ("gl_flashblend","1",0,"None");
-//	Cvar_RegisterVariable (&gl_playermip);
 	gl_playermip = Cvar_Get ("gl_playermip","0",0,"None");
-//	Cvar_RegisterVariable (&gl_nocolors);
 	gl_nocolors = Cvar_Get ("gl_nocolors","0",0,"None");
-//	Cvar_RegisterVariable (&gl_finish);
 	gl_finish = Cvar_Get ("gl_finish","0",0,"None");
 
-//	Cvar_RegisterVariable (&gl_keeptjunctions);
 #ifdef QUAKEWORLD
 	gl_keeptjunctions = Cvar_Get ("gl_keeptjunctions","1",0,"None");
 #else
@@ -260,10 +233,9 @@ void R_Init (void)
 	R_InitBubble();
 	
 #ifdef UQUAKE
-//	Cvar_RegisterVariable (&gl_doubleeyes);
 	gl_doubleeyes = Cvar_Get ("gl_doubleeyes","1",CVAR_ARCHIVE,"None");
+#endif /* UQUAKE */
 
-#endif /* QUAKEWORLD */
 	R_InitParticles ();
 	R_InitParticleTexture ();
 

common/gl_screen.c

@@ -402,7 +402,6 @@ void SCR_Init (void)
 	scr_centertime = Cvar_Get ("scr_centertime","2",0,"None");
 	scr_printspeed = Cvar_Get ("scr_printspeed","8",0,"None");
 	scr_allowsnap = Cvar_Get ("scr_allowsnap","1",0,"None");
-	gl_triplebuffer = Cvar_Get ("gl_triplebuffer","1",CVAR_ARCHIVE,"None");
 
 //
 // register our commands

common/gl_vidglx.c

@@ -82,10 +82,9 @@ unsigned short	d_8to16table[256];
 unsigned	d_8to24table[256];
 unsigned char	d_15to8table[65536];
 
-//cvar_t	vid_mode = {"vid_mode", "0", CVAR_NONE};
 cvar_t	*vid_mode;
-//cvar_t  vid_glx_fullscreen = {"vid_glx_fullscreen", "0", CVAR_NONE};
 cvar_t	*vid_glx_fullscreen;
+extern cvar_t	*gl_triplebuffer;
 
 #ifdef HAS_DGA
 static int	nummodes;
@@ -571,3 +570,8 @@ void VID_Init(unsigned char *palette)
 
 	vid.recalc_refdef = 1;		// force a surface cache flush
 }
+
+void VID_InitCvars()
+{
+	gl_triplebuffer = Cvar_Get("gl_triplebuffer","1",CVAR_ARCHIVE,"None");
+}

common/gl_vidlinux_3dfx.c

@@ -47,14 +47,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 unsigned		d_8to24table[256];
 unsigned char	d_15to8table[65536];
 
-//static cvar_t	vid_mode =				{"vid_mode", "5", CVAR_NONE};
 static cvar_t	*vid_mode;
-//static cvar_t	vid_redrawfull =		{"vid_redrawfull", "0", CVAR_NONE};
 static cvar_t	*vid_redrawfull;
-//static cvar_t	vid_waitforrefresh =	{"vid_waitforrefresh", "0", CVAR_ARCHIVE};
 static cvar_t	*vid_waitforrefresh;
-//cvar_t	gl_ztrick = {"gl_ztrick", "0", CVAR_ARCHIVE};
 cvar_t	*gl_ztrick;
+extern cvar_t	*gl_triplebuffer;
  
 static fxMesaContext fc = NULL;
 static int	scr_width, scr_height;
@@ -514,3 +511,7 @@ void VID_ExtraOptionCmd(int option_cursor)
 	}
 */
 }
+void VID_InitCvars ()
+{
+	gl_triplebuffer = Cvar_Get ("gl_triplebuffer","1",CVAR_ARCHIVE,"None");
+}

common/host.c

@@ -53,6 +53,7 @@
 #include <mathlib.h>
 #include <menu.h>
 
+
 extern int host_hunklevel;
 
 jmp_buf 	host_abort;
@@ -547,7 +548,8 @@ Host_Init ( quakeparms_t *parms)
 		Sys_Error ("Only %4.1fMB of memory reported, can't execute game", parms->memsize / (float) 0x100000);
 	
 	Memory_Init (parms->membase, parms->memsize);
-	CL_InitCvars();
+	CL_InitCvars ();
+	VID_InitCvars ();
 	Cbuf_Init ();
 	Cmd_Init ();
 	V_Init ();

common/vid.h

@@ -94,6 +94,9 @@ void VID_ExtraOptionDraw(unsigned int);
 void VID_ExtraOptionCmd(int options_cursor);
 // commands for the extra menu options of the target
 
+void VID_InitCvars(void);
+// used to initialize any cvars needed early in program execution
+
 qboolean VID_Is8bit(void);
 
 #endif // _VID_H

common/vid_aa.c

@@ -537,3 +537,7 @@ VID_ExtraOptionCmd(int option_cursor)
 #endif
 }
 
+void VID_InitCvars ()
+{
+	// It may not look it, but this is important
+}

common/vid_dos.c

@@ -804,3 +804,8 @@ void VID_ExtraOptionCmd(int option_cursor)
 	}
 */
 }
+
+void VID_InitCvars ()
+{
+	// It may not look it, but this is important
+}

common/vid_ggi.c

@@ -962,3 +962,8 @@ VID_ExtraOptionCmd(int option_cursor)
 
 	}
 }
+
+void VID_InitCvars ()
+{
+	// It may not look it, but this is important
+}

common/vid_sdl.c

@@ -465,3 +465,8 @@ void VID_ExtraOptionCmd(int option_cursor)
 
 	}
 }
+
+void VID_InitCvars ()
+{
+	// It may not look like it, but this is important
+}

common/vid_sunx.c

@@ -1164,3 +1164,7 @@ void VID_ExtraOptionCmd(int option_cursor)
 	}
 }
 
+void VID_InitCvars (void)
+{
+	// It may not look like it, but this is important
+}

common/vid_sunxil.c

@@ -1277,3 +1277,8 @@ void VID_ExtraOptionCmd(int option_cursor)
 
 	}
 }
+
+void VID_InitCvars ()
+{
+	// It may not look like it, but this is important
+}

common/vid_svgalib.c

@@ -694,3 +694,7 @@ VID_ExtraOptionCmd(int option_cursor)
 #endif
 }
 
+void VID_InitCvars ()
+{
+	// It may not look like it, but this is important
+}

common/vid_win.c

@@ -3447,3 +3447,7 @@ void VID_ExtraOptionCmd(int option_cursor)
 	}
 }
 
+void VID_InitCvars()
+{
+	// It may not look like it, but this is important
+}

common/vid_x11.c

@@ -852,3 +852,7 @@ VID_DitherOff(void)
 	}
 }
 
+void VID_InitCvars ()
+{
+	// It may not look like it, but this is important
+}

qw_server/sv_main.c

@@ -154,6 +154,7 @@ void SV_Shutdown (void)
 		sv_logfile = NULL;
 	}
 	NET_Shutdown ();
+	Cvar_Shutdown ();
 }
 
 /*