diff --git a/Makefile b/Makefile
index f483f06..6e58280 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SUBDIRS = qw_client qw_server #standalone	#standalone isn't done merging yet
 
-all:
+all %:
 	for dir in $(SUBDIRS); do \
-	$(MAKE) -C $$dir; \
+	$(MAKE) -C $$dir $@; \
 	done
diff --git a/common/gl_vidlinuxglx.c b/common/gl_vidlinuxglx.c
index 9acbee6..bd401e7 100644
--- a/common/gl_vidlinuxglx.c
+++ b/common/gl_vidlinuxglx.c
@@ -506,8 +506,6 @@ GL_BeginRendering
 */
 void GL_BeginRendering (int *x, int *y, int *width, int *height)
 {
-	extern cvar_t gl_clear;
-
 	*x = *y = 0;
 	*width = scr_width;
 	*height = scr_height;
diff --git a/qw_client/cl_parse.c b/qw_client/cl_parse.c
index 267e523..197bfaf 100644
--- a/qw_client/cl_parse.c
+++ b/qw_client/cl_parse.c
@@ -116,7 +116,6 @@ int CL_CalcNet (void)
 	int		a, i;
 	frame_t	*frame;
 	int lost;
-	char st[80];
 
 	for (i=cls.netchan.outgoing_sequence-UPDATE_BACKUP+1
 		; i <= cls.netchan.outgoing_sequence
@@ -1008,8 +1007,6 @@ CL_ServerInfo
 */
 void CL_ServerInfo (void)
 {
-	int		slot;
-	player_info_t	*player;
 	char key[MAX_MSGLEN];
 	char value[MAX_MSGLEN];
 
diff --git a/qw_client/gl_mesh.c b/qw_client/gl_mesh.c
index 553ce78..0e8de29 100644
--- a/qw_client/gl_mesh.c
+++ b/qw_client/gl_mesh.c
@@ -200,7 +200,7 @@ void BuildTris (void)
 	int		i, j, k;
 	int		startv;
 	float	s, t;
-	int		len, bestlen, besttype;
+	int		len, bestlen, besttype = 0;
 	int		bestverts[1024];
 	int		besttris[1024];
 	int		type;
diff --git a/qw_client/gl_screen.c b/qw_client/gl_screen.c
index fd62cba..4500b9b 100644
--- a/qw_client/gl_screen.c
+++ b/qw_client/gl_screen.c
@@ -465,7 +465,7 @@ void SCR_DrawFPS (void)
 	static double lastframetime;
 	double t;
 	extern int fps_count;
-	static lastfps;
+	static int lastfps;
 	int x, y;
 	char st[80];
 
@@ -753,7 +753,7 @@ int MipColor(int r, int g, int b)
 {
 	int i;
 	float dist;
-	int best;
+	int best = 0;
 	float bestdist;
 	int r1, g1, b1;
 	static int lr = -1, lg = -1, lb = -1;
@@ -830,12 +830,12 @@ SCR_RSShot_f
 */  
 void SCR_RSShot_f (void) 
 { 
-	int     i, x, y;
+//	int     i;
+	int     x, y;
 	unsigned char		*src, *dest;
 	char		pcxname[80]; 
-	char		checkname[MAX_OSPATH];
-	unsigned char		*newbuf, *srcbuf;
-	int srcrowbytes;
+//	char		checkname[MAX_OSPATH];
+	unsigned char		*newbuf;
 	int w, h;
 	int dx, dy, dex, dey, nx;
 	int r, b, g;
diff --git a/qw_client/gl_vidlinux.c b/qw_client/gl_vidlinux.c
index b3f38fe..2fb19c3 100644
--- a/qw_client/gl_vidlinux.c
+++ b/qw_client/gl_vidlinux.c
@@ -334,8 +334,6 @@ GL_BeginRendering
 */
 void GL_BeginRendering (int *x, int *y, int *width, int *height)
 {
-	extern cvar_t gl_clear;
-
 	*x = *y = 0;
 	*width = scr_width;
 	*height = scr_height;
@@ -472,7 +470,7 @@ void Init_KBD(void)
 
 #define NUM_RESOLUTIONS 3
 
-static resolutions[NUM_RESOLUTIONS][3]={ 
+static int resolutions[NUM_RESOLUTIONS][3]={ 
   { 512, 384, GR_RESOLUTION_512x384 },
   { 640, 400, GR_RESOLUTION_640x400 },
   { 640, 480, GR_RESOLUTION_640x480 }
diff --git a/qw_client/gl_vidlinux_svga.c b/qw_client/gl_vidlinux_svga.c
deleted file mode 100644
index 697ef02..0000000
--- a/qw_client/gl_vidlinux_svga.c
+++ /dev/null
@@ -1,855 +0,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/vt.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <signal.h>
-
-#include <asm/io.h>
-
-/*#include "vga.h" */
-#include "vgakeyboard.h"
-#include "vgamouse.h"
-
-#include "quakedef.h"
-#include "GL/fxmesa.h"
-
-#define WARP_WIDTH              320
-#define WARP_HEIGHT             200
-
-static fxMesaContext fc = NULL;
-#define stringify(m) { #m, m }
-
-unsigned short	d_8to16table[256];
-unsigned	d_8to24table[256];
-unsigned char d_15to8table[65536];
-
-int num_shades=32;
-
-struct
-{
-	char *name;
-	int num;
-} mice[] =
-{
-	stringify(MOUSE_MICROSOFT),
-	stringify(MOUSE_MOUSESYSTEMS),
-	stringify(MOUSE_MMSERIES),
-	stringify(MOUSE_LOGITECH),
-	stringify(MOUSE_BUSMOUSE),
-	stringify(MOUSE_PS2),
-};
-
-static unsigned char scantokey[128];
-
-int num_mice = sizeof (mice) / sizeof(mice[0]);
-
-int	d_con_indirect = 0;
-
-int		svgalib_inited=0;
-int		UseMouse = 1;
-int		UseKeyboard = 1;
-
-int		mouserate = MOUSE_DEFAULTSAMPLERATE;
-
-cvar_t		vid_mode = {"vid_mode","5",false};
-cvar_t		vid_redrawfull = {"vid_redrawfull","0",false};
-cvar_t		vid_waitforrefresh = {"vid_waitforrefresh","0",true};
- 
-char	*framebuffer_ptr;
-
-cvar_t  mouse_button_commands[3] =
-{
-    {"mouse1","+attack"},
-    {"mouse2","+strafe"},
-    {"mouse3","+forward"},
-};
-
-int     mouse_buttons;
-int     mouse_buttonstate;
-int     mouse_oldbuttonstate;
-float   mouse_x, mouse_y;
-float	old_mouse_x, old_mouse_y;
-int		mx, my;
-
-cvar_t _windowed_mouse = {"_windowed_mouse", "1", true};
-cvar_t	m_filter = {"m_filter","0"};
-
-int scr_width, scr_height;
-
-/*-----------------------------------------------------------------------*/
-
-//int		texture_mode = GL_NEAREST;
-//int		texture_mode = GL_NEAREST_MIPMAP_NEAREST;
-//int		texture_mode = GL_NEAREST_MIPMAP_LINEAR;
-int		texture_mode = GL_LINEAR;
-//int		texture_mode = GL_LINEAR_MIPMAP_NEAREST;
-//int		texture_mode = GL_LINEAR_MIPMAP_LINEAR;
-
-int		texture_extension_number = 1;
-
-float		gldepthmin, gldepthmax;
-
-cvar_t	gl_ztrick = {"gl_ztrick","1"};
-
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
-
-qboolean is8bit = false;
-qboolean isPermedia = false;
-qboolean gl_mtexable = false;
-
-/*-----------------------------------------------------------------------*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-}
-
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-}
-
-/*
-=================
-VID_Gamma_f
-
-Keybinding command
-=================
-*/
-void VID_Gamma_f (void)
-{
-	float	gamma, f, inf;
-	unsigned char	palette[768];
-	int		i;
-
-	if (Cmd_Argc () == 2)
-	{
-		gamma = Q_atof (Cmd_Argv(1));
-
-		for (i=0 ; i<768 ; i++)
-		{
-			f = pow ( (host_basepal[i]+1)/256.0 , gamma );
-			inf = f*255 + 0.5;
-			if (inf < 0)
-				inf = 0;
-			if (inf > 255)
-				inf = 255;
-			palette[i] = inf;
-		}
-
-		VID_SetPalette (palette);
-
-		vid.recalc_refdef = 1;				// force a surface cache flush
-	}
-}
-
-int matchmouse(int mouse, char *name)
-{
-	int i;
-	for (i=0 ; i<num_mice ; i++)
-		if (!strcmp(mice[i].name, name))
-			return i;
-	return mouse;
-}
-
-#if 0
-
-void vtswitch(int newconsole)
-{
-
-	int fd;
-	struct vt_stat x;
-
-// switch consoles and wait until reactivated
-	fd = open("/dev/console", O_RDONLY);
-	ioctl(fd, VT_GETSTATE, &x);
-	ioctl(fd, VT_ACTIVATE, newconsole);
-	ioctl(fd, VT_WAITACTIVE, x.v_active);
-	close(fd);
-
-}
-
-#endif
-
-void keyhandler(int scancode, int state)
-{
-	
-	int sc;
-
-	sc = scancode & 0x7f;
-//	Con_Printf("scancode=%x (%d%s)\n", scancode, sc, scancode&0x80?"+128":"");
-	Key_Event(scantokey[sc], state == KEY_EVENTPRESS);
-
-}
-
-void VID_Shutdown(void)
-{
-	if (!fc)
-		return;
-
-	fxMesaDestroyContext(fc);
-
-	if (UseKeyboard)
-		keyboard_close();
-}
-
-void signal_handler(int sig)
-{
-	printf("Received signal %d, exiting...\n", sig);
-	VID_Shutdown();
-	exit(0);
-}
-
-void InitSig(void)
-{
-	signal(SIGHUP, signal_handler);
-	signal(SIGQUIT, signal_handler);
-	signal(SIGILL, signal_handler);
-	signal(SIGTRAP, signal_handler);
-	signal(SIGIOT, signal_handler);
-	signal(SIGBUS, signal_handler);
-	signal(SIGFPE, signal_handler);
-	signal(SIGSEGV, signal_handler);
-	signal(SIGTERM, signal_handler);
-}
-
-void VID_ShiftPalette(unsigned char *p)
-{
-	VID_SetPalette(p);
-}
-
-void	VID_SetPalette (unsigned char *palette)
-{
-	byte	*pal;
-	unsigned short r,g,b;
-	int     v;
-	int     r1,g1,b1;
-	int		k;
-	unsigned short i;
-	unsigned	*table;
-	FILE *f;
-	char s[255];
-	float dist, bestdist;
-	static qboolean palflag = false;
-
-//
-// 8 8 8 encoding
-//
-	pal = palette;
-	table = d_8to24table;
-	for (i=0 ; i<256 ; i++)
-	{
-		r = pal[0];
-		g = pal[1];
-		b = pal[2];
-		pal += 3;
-		
-//		v = (255<<24) + (r<<16) + (g<<8) + (b<<0);
-//		v = (255<<0) + (r<<8) + (g<<16) + (b<<24);
-		v = (255<<24) + (r<<0) + (g<<8) + (b<<16);
-		*table++ = v;
-	}
-	d_8to24table[255] &= 0xffffff;	// 255 is transparent
-
-	// JACK: 3D distance calcs - k is last closest, l is the distance.
-	// FIXME: Precalculate this and cache to disk.
-	if (palflag)
-		return;
-	palflag = true;
-
-	COM_FOpenFile("glquake/15to8.pal", &f);
-	if (f) {
-		fread(d_15to8table, 1<<15, 1, f);
-		fclose(f);
-	} else {
-		for (i=0; i < (1<<15); i++) {
-			/* Maps
- 			000000000000000
- 			000000000011111 = Red  = 0x1F
- 			000001111100000 = Blue = 0x03E0
- 			111110000000000 = Grn  = 0x7C00
- 			*/
- 			r = ((i & 0x1F) << 3)+4;
- 			g = ((i & 0x03E0) >> 2)+4;
- 			b = ((i & 0x7C00) >> 7)+4;
-			pal = (unsigned char *)d_8to24table;
-			for (v=0,k=0,bestdist=10000.0; v<256; v++,pal+=4) {
- 				r1 = (int)r - (int)pal[0];
- 				g1 = (int)g - (int)pal[1];
- 				b1 = (int)b - (int)pal[2];
-				dist = sqrt(((r1*r1)+(g1*g1)+(b1*b1)));
-				if (dist < bestdist) {
-					k=v;
-					bestdist = dist;
-				}
-			}
-			d_15to8table[i]=k;
-		}
-		sprintf(s, "%s/glquake", com_gamedir);
- 		Sys_mkdir (s);
-		sprintf(s, "%s/glquake/15to8.pal", com_gamedir);
-		if ((f = fopen(s, "wb")) != NULL) {
-			fwrite(d_15to8table, 1<<15, 1, f);
-			fclose(f);
-		}
-	}
-}
-
-/*
-===============
-GL_Init
-===============
-*/
-void GL_Init (void)
-{
-	gl_vendor = glGetString (GL_VENDOR);
-	Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
-	gl_renderer = glGetString (GL_RENDERER);
-	Con_Printf ("GL_RENDERER: %s\n", gl_renderer);
-
-	gl_version = glGetString (GL_VERSION);
-	Con_Printf ("GL_VERSION: %s\n", gl_version);
-	gl_extensions = glGetString (GL_EXTENSIONS);
-	Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
-
-//	Con_Printf ("%s %s\n", gl_renderer, gl_version);
-
-	glClearColor (1,0,0,0);
-	glCullFace(GL_FRONT);
-	glEnable(GL_TEXTURE_2D);
-
-	glEnable(GL_ALPHA_TEST);
-	glAlphaFunc(GL_GREATER, 0.666);
-
-	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-	glShadeModel (GL_FLAT);
-
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-//	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-}
-
-/*
-=================
-GL_BeginRendering
-
-=================
-*/
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
-{
-	extern cvar_t gl_clear;
-
-	*x = *y = 0;
-	*width = scr_width;
-	*height = scr_height;
-
-//    if (!wglMakeCurrent( maindc, baseRC ))
-//		Sys_Error ("wglMakeCurrent failed");
-
-//	glViewport (*x, *y, *width, *height);
-}
-
-
-void GL_EndRendering (void)
-{
-	glFlush();
-	fxMesaSwapBuffers();
-}
-
-void Init_KBD(void)
-{
-	int i;
-
-	if (COM_CheckParm("-nokbd")) UseKeyboard = 0;
-
-	if (UseKeyboard)
-	{
-		for (i=0 ; i<128 ; i++)
-			scantokey[i] = ' ';
-
-		scantokey[  1] = K_ESCAPE;
-		scantokey[  2] = '1';
-		scantokey[  3] = '2';
-		scantokey[  4] = '3';
-		scantokey[  5] = '4';
-		scantokey[  6] = '5';
-		scantokey[  7] = '6';
-		scantokey[  8] = '7';
-		scantokey[  9] = '8';
-		scantokey[ 10] = '9';
-		scantokey[ 11] = '0';
-		scantokey[ 12] = '-';
-		scantokey[ 13] = '=';
-		scantokey[ 14] = K_BACKSPACE;
-		scantokey[ 15] = K_TAB;
-		scantokey[ 16] = 'q';       
-		scantokey[ 17] = 'w';       
-		scantokey[ 18] = 'e';       
-		scantokey[ 19] = 'r';       
-		scantokey[ 20] = 't';       
-		scantokey[ 21] = 'y';       
-		scantokey[ 22] = 'u';       
-		scantokey[ 23] = 'i';       
-		scantokey[ 24] = 'o';       
-		scantokey[ 25] = 'p';       
-		scantokey[ 26] = '[';
-		scantokey[ 27] = ']';
-		scantokey[ 28] = K_ENTER;
-		scantokey[ 29] = K_CTRL; //left
-		scantokey[ 30] = 'a';
-		scantokey[ 31] = 's';       
-		scantokey[ 32] = 'd';       
-		scantokey[ 33] = 'f';       
-		scantokey[ 34] = 'g';       
-		scantokey[ 35] = 'h';       
-		scantokey[ 36] = 'j';       
-		scantokey[ 37] = 'k';       
-		scantokey[ 38] = 'l';       
-		scantokey[ 39] = ';';
-		scantokey[ 40] = '\'';
-		scantokey[ 41] = '`';
-		scantokey[ 42] = K_SHIFT; //left
-		scantokey[ 43] = '\\';
-		scantokey[ 44] = 'z';       
-		scantokey[ 45] = 'x';  
-		scantokey[ 46] = 'c';
-		scantokey[ 47] = 'v';       
-		scantokey[ 48] = 'b';
-		scantokey[ 49] = 'n';       
-		scantokey[ 50] = 'm';       
-		scantokey[ 51] = ',';
-		scantokey[ 52] = '.';
-		scantokey[ 53] = '/';
-		scantokey[ 54] = K_SHIFT; //right
-		scantokey[ 55] = '*'; //keypad
-		scantokey[ 56] = K_ALT; //left
-		scantokey[ 57] = ' ';
-		// 58 caps lock
-		scantokey[ 59] = K_F1;
-		scantokey[ 60] = K_F2;
-		scantokey[ 61] = K_F3;
-		scantokey[ 62] = K_F4;
-		scantokey[ 63] = K_F5;
-		scantokey[ 64] = K_F6;
-		scantokey[ 65] = K_F7;
-		scantokey[ 66] = K_F8;
-		scantokey[ 67] = K_F9;
-		scantokey[ 68] = K_F10;
-		// 69 numlock
-		// 70 scrollock
-		scantokey[ 71] = K_HOME;
-		scantokey[ 72] = K_UPARROW;
-		scantokey[ 73] = K_PGUP;
-		scantokey[ 74] = '-';
-		scantokey[ 75] = K_LEFTARROW;
-		scantokey[ 76] = '5';
-		scantokey[ 77] = K_RIGHTARROW;
-		scantokey[ 79] = K_END;
-		scantokey[ 78] = '+';
-		scantokey[ 80] = K_DOWNARROW;
-		scantokey[ 81] = K_PGDN;
-		scantokey[ 82] = K_INS;
-		scantokey[ 83] = K_DEL;
-		// 84 to 86 not used
-		scantokey[ 87] = K_F11;
-		scantokey[ 88] = K_F12;
-		// 89 to 95 not used
-		scantokey[ 96] = K_ENTER; //keypad enter
-		scantokey[ 97] = K_CTRL; //right
-		scantokey[ 98] = '/';
-		scantokey[ 99] = K_F12; // print screen, bind to screenshot by default
-		scantokey[100] = K_ALT; // right
-
-
-		scantokey[101] = K_PAUSE; // break
-		scantokey[102] = K_HOME;
-		scantokey[103] = K_UPARROW;
-		scantokey[104] = K_PGUP;
-		scantokey[105] = K_LEFTARROW;
-		scantokey[106] = K_RIGHTARROW;
-		scantokey[107] = K_END;
-		scantokey[108] = K_DOWNARROW;
-		scantokey[109] = K_PGDN;
-		scantokey[110] = K_INS;
-		scantokey[111] = K_DEL;
-
-		scantokey[119] = K_PAUSE;
-
-		if (keyboard_init())
-			Sys_Error("keyboard_init() failed");
-		keyboard_seteventhandler(keyhandler);
-	}
-}
-
-#define NUM_RESOLUTIONS 3
-
-static resolutions[NUM_RESOLUTIONS][3]={ 
-  { 512, 384, GR_RESOLUTION_512x384 },
-  { 640, 400, GR_RESOLUTION_640x400 },
-  { 640, 480, GR_RESOLUTION_640x480 }
-};
-
-int findres(int *width, int *height)
-{
-	int i;
-
-	for(i=0;i<NUM_RESOLUTIONS;i++)
-		if((*width<=resolutions[i][0]) && (*height<=resolutions[i][1])) {
-			*width = resolutions[i][0];
-			*height = resolutions[i][1];
-			return resolutions[i][2];
-		}
-        
-	*width = 640;
-	*height = 480;
-	return GR_RESOLUTION_640x480;
-}
-
-qboolean VID_Is8bit(void)
-{
-	return is8bit;
-}
-
-#ifdef GL_EXT_SHARED
-void VID_Init8bitPalette() 
-{
-	// Check for 8bit Extensions and initialize them.
-	int i;
-	char thePalette[256*3];
-	char *oldPalette, *newPalette;
-
-	if (strstr(gl_extensions, "GL_EXT_shared_texture_palette") == NULL)
-		return;
-
-	Con_SafePrintf("8-bit GL extensions enabled.\n");
-	glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
-	oldPalette = (char *) d_8to24table; //d_8to24table3dfx;
-	newPalette = thePalette;
-	for (i=0;i<256;i++) {
-		*newPalette++ = *oldPalette++;
-		*newPalette++ = *oldPalette++;
-		*newPalette++ = *oldPalette++;
-		oldPalette++;
-	}
-	glColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
-	is8bit = true;
-}
-
-#else
-extern void gl3DfxSetPaletteEXT(GLuint *pal);
-
-void VID_Init8bitPalette(void) 
-{
-	// Check for 8bit Extensions and initialize them.
-	int i;
-	GLubyte table[256][4];
-	char *oldpal;
-
-	if (strstr(gl_extensions, "3DFX_set_global_palette") == NULL)
-		return;
-
-	Con_SafePrintf("8-bit GL extensions enabled.\n");
-	glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
-	oldpal = (char *) d_8to24table; //d_8to24table3dfx;
-	for (i=0;i<256;i++) {
-		table[i][2] = *oldpal++;
-		table[i][1] = *oldpal++;
-		table[i][0] = *oldpal++;
-		table[i][3] = 255;
-		oldpal++;
-	}
-	gl3DfxSetPaletteEXT((GLuint *)table);
-	is8bit = true;
-}
-#endif
-
-void VID_Init(unsigned char *palette)
-{
-	int i;
-	GLint attribs[32];
-	char	gldir[MAX_OSPATH];
-	int width = 640, height = 480;
-
-	S_Init();
-
-	Init_KBD();
-
-	Cvar_RegisterVariable (&vid_mode);
-	Cvar_RegisterVariable (&vid_redrawfull);
-	Cvar_RegisterVariable (&vid_waitforrefresh);
-	Cvar_RegisterVariable (&gl_ztrick);
-	
-        vid.maxwarpwidth = WARP_WIDTH;
-        vid.maxwarpheight = WARP_HEIGHT;
-        vid.colormap = host_colormap;
-        vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-
-// interpret command-line params
-
-// set vid parameters
-	attribs[0] = FXMESA_DOUBLEBUFFER;
-	attribs[1] = FXMESA_ALPHA_SIZE;
-	attribs[2] = 1;
-	attribs[3] = FXMESA_DEPTH_SIZE;
-	attribs[4] = 1;
-	attribs[5] = FXMESA_NONE;
-
-	if ((i = COM_CheckParm("-width")) != 0)
-		width = atoi(com_argv[i+1]);
-	if ((i = COM_CheckParm("-height")) != 0)
-		height = atoi(com_argv[i+1]);
-
-	if ((i = COM_CheckParm("-conwidth")) != 0)
-		vid.conwidth = Q_atoi(com_argv[i+1]);
-	else
-		vid.conwidth = 640;
-
-	vid.conwidth &= 0xfff8; // make it a multiple of eight
-
-	if (vid.conwidth < 320)
-		vid.conwidth = 320;
-
-	// pick a conheight that matches with correct aspect
-	vid.conheight = vid.conwidth*3 / 4;
-
-	if ((i = COM_CheckParm("-conheight")) != 0)
-		vid.conheight = Q_atoi(com_argv[i+1]);
-	if (vid.conheight < 200)
-		vid.conheight = 200;
-
-	fc = fxMesaCreateContext(0, findres(&width, &height), GR_REFRESH_75Hz, 
-		attribs);
-	if (!fc)
-		Sys_Error("Unable to create 3DFX context.\n");
-
-	scr_width = width;
-	scr_height = height;
-
-	fxMesaMakeCurrent(fc);
-
-	if (vid.conheight > height)
-		vid.conheight = height;
-	if (vid.conwidth > width)
-		vid.conwidth = width;
-	vid.width = vid.conwidth;
-	vid.height = vid.conheight;
-
-	vid.aspect = ((float)vid.height / (float)vid.width) *
-				(320.0 / 240.0);
-	vid.numpages = 2;
-
-	InitSig(); // trap evil signals
-
-	GL_Init();
-
-	sprintf (gldir, "%s/glquake", com_gamedir);
-	Sys_mkdir (gldir);
-
-	VID_SetPalette(palette);
-
-	// Check for 3DFX Extensions and initialize them.
-	VID_Init8bitPalette();
-
-	Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
-
-	vid.recalc_refdef = 1;				// force a surface cache flush
-}
-
-void Sys_SendKeyEvents(void)
-{
-	if (UseKeyboard)
-		while (keyboard_update());
-}
-
-void Force_CenterView_f (void)
-{
-	cl.viewangles[PITCH] = 0;
-}
-
-
-void mousehandler(int buttonstate, int dx, int dy)
-{
-	mouse_buttonstate = buttonstate;
-	mx += dx;
-	my += dy;
-}
-
-void IN_Init(void)
-{
-
-	int mtype;
-	char *mousedev;
-	int mouserate;
-
-	if (UseMouse)
-	{
-
-		Cvar_RegisterVariable (&mouse_button_commands[0]);
-		Cvar_RegisterVariable (&mouse_button_commands[1]);
-		Cvar_RegisterVariable (&mouse_button_commands[2]);
-		Cmd_AddCommand ("force_centerview", Force_CenterView_f);
-
-		mouse_buttons = 3;
-
-		mtype = vga_getmousetype();
-
-		mousedev = "/dev/mouse";
-		if (getenv("MOUSEDEV")) mousedev = getenv("MOUSEDEV");
-		if (COM_CheckParm("-mdev"))
-			mousedev = com_argv[COM_CheckParm("-mdev")+1];
-
-		mouserate = 1200;
-		if (getenv("MOUSERATE")) mouserate = atoi(getenv("MOUSERATE"));
-		if (COM_CheckParm("-mrate"))
-			mouserate = atoi(com_argv[COM_CheckParm("-mrate")+1]);
-
-		if (mouse_init(mousedev, mtype, mouserate))
-		{
-			Con_Printf("No mouse found\n");
-			UseMouse = 0;
-		}
-		else
-			mouse_seteventhandler(mousehandler);
-
-	}
-
-}
-
-void IN_Shutdown(void)
-{
-	if (UseMouse)
-		mouse_close();
-}
-
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-	if (UseMouse)
-	{
-		// poll mouse values
-		while (mouse_update())
-			;
-
-		// perform button actions
-		if ((mouse_buttonstate & MOUSE_LEFTBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_LEFTBUTTON))
-			Key_Event (K_MOUSE1, true);
-		else if (!(mouse_buttonstate & MOUSE_LEFTBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_LEFTBUTTON))
-			Key_Event (K_MOUSE1, false);
-
-		if ((mouse_buttonstate & MOUSE_RIGHTBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_RIGHTBUTTON))
-			Key_Event (K_MOUSE2, true);
-		else if (!(mouse_buttonstate & MOUSE_RIGHTBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_RIGHTBUTTON))
-			Key_Event (K_MOUSE2, false);
-
-		if ((mouse_buttonstate & MOUSE_MIDDLEBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_MIDDLEBUTTON))
-			Key_Event (K_MOUSE3, true);
-		else if (!(mouse_buttonstate & MOUSE_MIDDLEBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_MIDDLEBUTTON))
-			Key_Event (K_MOUSE3, false);
-
-		mouse_oldbuttonstate = mouse_buttonstate;
-	}
-}
-
-/*
-===========
-IN_Move
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
-	if (!UseMouse)
-		return;
-
-	// poll mouse values
-	while (mouse_update())
-		;
-
-	if (m_filter.value)
-	{
-		mouse_x = (mx + old_mouse_x) * 0.5;
-		mouse_y = (my + old_mouse_y) * 0.5;
-	}
-	else
-	{
-		mouse_x = mx;
-		mouse_y = my;
-	}
-	old_mouse_x = mx;
-	old_mouse_y = my;
-	mx = my = 0; // clear for next update
-
-	mouse_x *= sensitivity.value;
-	mouse_y *= sensitivity.value;
-
-// add mouse X/Y movement to cmd
-	if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
-		cmd->sidemove += m_side.value * mouse_x;
-	else
-		cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-	
-	if (in_mlook.state & 1)
-		V_StopPitchDrift ();
-		
-	if ( (in_mlook.state & 1) && !(in_strafe.state & 1))
-	{
-		cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-		if (cl.viewangles[PITCH] > 80)
-			cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70)
-			cl.viewangles[PITCH] = -70;
-	}
-	else
-	{
-		if ((in_strafe.state & 1) && noclip_anglehack)
-			cmd->upmove -= m_forward.value * mouse_y;
-		else
-			cmd->forwardmove -= m_forward.value * mouse_y;
-	}
-}
-
-void IN_Move (usercmd_t *cmd)
-{
-	IN_MouseMove(cmd);
-}
-
-
-void	VID_LockBuffer (void) {}
-void	VID_UnlockBuffer (void) {}
-
diff --git a/qw_client/gl_warp.c b/qw_client/gl_warp.c
index a7ac7f9..cae1d2d 100644
--- a/qw_client/gl_warp.c
+++ b/qw_client/gl_warp.c
@@ -1034,7 +1034,6 @@ void R_InitSky (texture_t *mt)
 	unsigned	transpix;
 	int			r, g, b;
 	unsigned	*rgba;
-	extern	int			skytexturenum;
 
 	src = (byte *)mt + mt->offsets[0];
 
diff --git a/qw_client/r_misc.c b/qw_client/r_misc.c
index eee93d3..96228cc 100644
--- a/qw_client/r_misc.c
+++ b/qw_client/r_misc.c
@@ -210,7 +210,6 @@ R_NetGraph
 void R_NetGraph (void)
 {
 	int		a, x, y, y2, w, i;
-	frame_t	*frame;
 	int lost;
 	char st[80];
 
diff --git a/qw_client/screen.c b/qw_client/screen.c
index 500a27b..3a717c5 100644
--- a/qw_client/screen.c
+++ b/qw_client/screen.c
@@ -780,12 +780,12 @@ SCR_RSShot_f
 */  
 void SCR_RSShot_f (void) 
 { 
-	int     i, x, y;
+//	int     i, x, y;
+	int    x, y;
 	unsigned char		*src, *dest;
 	char		pcxname[80]; 
-	char		checkname[MAX_OSPATH];
-	unsigned char		*newbuf, *srcbuf;
-	int srcrowbytes;
+//	char		checkname[MAX_OSPATH];
+	unsigned char		*newbuf;
 	int w, h;
 	int dx, dy, dex, dey, nx;
 	int r, b, g;
diff --git a/qw_common/common.c b/qw_common/common.c
index c7e3ca7..1d824fb 100644
--- a/qw_common/common.c
+++ b/qw_common/common.c
@@ -2173,11 +2173,11 @@ static byte chktbl[1024 + 4] = {
 0x00,0x00,0x00,0x00
 };
 
+#if 0
 static byte chkbuf[16 + 60 + 4];
 
 static unsigned last_mapchecksum = 0;
 
-#if 0
 /*
 ====================
 COM_BlockSequenceCheckByte
diff --git a/qw_common/net_chan.c b/qw_common/net_chan.c
index 9868375..2c08fad 100644
--- a/qw_common/net_chan.c
+++ b/qw_common/net_chan.c
@@ -329,7 +329,7 @@ qboolean Netchan_Process (netchan_t *chan)
 #ifdef SERVERONLY
 	int			qport;
 #endif
-	int i;
+	//int i;
 
 	if (
 #ifndef SERVERONLY
diff --git a/qw_common/net_udp.c b/qw_common/net_udp.c
index 758b9bc..e1d47b6 100644
--- a/qw_common/net_udp.c
+++ b/qw_common/net_udp.c
@@ -158,10 +158,10 @@ qboolean	NET_StringToAdr (char *s, netadr_t *a)
 // the IP is NOT one of our interfaces.
 qboolean NET_IsClientLegal(netadr_t *adr)
 {
+#if 0
 	struct sockaddr_in sadr;
 	int newsocket;
 
-#if 0
 	if (adr->ip[0] == 127)
 		return false; // no local connections period
 
diff --git a/qw_common/pmove.c b/qw_common/pmove.c
index e8761be..70ae72d 100644
--- a/qw_common/pmove.c
+++ b/qw_common/pmove.c
@@ -775,16 +775,13 @@ SpectatorMove
 */
 void SpectatorMove (void)
 {
-	float	speed, drop, friction, control, newspeed, accel;
+	float	speed, drop, friction, control, newspeed;
 	float	currentspeed, addspeed, accelspeed;
 	int			i;
 	vec3_t		wishvel;
 	float		fmove, smove;
 	vec3_t		wishdir;
 	float		wishspeed;
-#ifndef SERVERONLY
-	extern float	server_version;	// version of server we connected to
-#endif
 
 	// friction
 
diff --git a/qw_server/pr_cmds.c b/qw_server/pr_cmds.c
index d7cbecb..8775efd 100644
--- a/qw_server/pr_cmds.c
+++ b/qw_server/pr_cmds.c
@@ -1301,9 +1301,9 @@ MESSAGE WRITING
 
 sizebuf_t *WriteDest (void)
 {
-	int		entnum;
+//	int		entnum;
 	int		dest;
-	edict_t	*ent;
+//	edict_t	*ent;
 
 	dest = G_FLOAT(OFS_PARM0);
 	switch (dest)
diff --git a/qw_server/server.h b/qw_server/server.h
index c9622eb..64567cb 100644
--- a/qw_server/server.h
+++ b/qw_server/server.h
@@ -353,6 +353,7 @@ void SV_DropClient (client_t *drop);
 
 int SV_CalcPing (client_t *cl);
 void SV_FullClientUpdate (client_t *client, sizebuf_t *buf);
+void SV_FullClientUpdateToClient (client_t *client, client_t *cl);
 
 int SV_ModelIndex (char *name);
 
diff --git a/qw_server/sv_main.c b/qw_server/sv_main.c
index 275aa54..e87eca0 100644
--- a/qw_server/sv_main.c
+++ b/qw_server/sv_main.c
@@ -185,7 +185,7 @@ void SV_DropClient (client_t *drop)
 	// add the disconnect
 	MSG_WriteByte (&drop->netchan.message, svc_disconnect);
 
-	if (drop->state == cs_spawned)
+	if (drop->state == cs_spawned) {
 		if (!drop->spectator)
 		{
 			// call the prog function for removing a client
@@ -200,6 +200,7 @@ void SV_DropClient (client_t *drop)
 			pr_global_struct->self = EDICT_TO_PROG(drop->edict);
 			PR_ExecuteProgram (SpectatorDisconnect);
 		}
+	}
 
 	if (drop->spectator)
 		Con_Printf ("Spectator %s removed\n",drop->name);
@@ -1514,11 +1515,12 @@ void SV_ExtractFromUserinfo (client_t *cl)
 				val[sizeof(cl->name) - 4] = 0;
 			p = val;
 
-			if (val[0] == '(')
+			if (val[0] == '(') {
 				if (val[2] == ')')
 					p = val + 3;
 				else if (val[3] == ')')
 					p = val + 4;
+			}
 
 			sprintf(newname, "(%d)%-.40s", dupc++, p);
 			Info_SetValueForKey (cl->userinfo, "name", newname, MAX_INFO_STRING);
diff --git a/qw_server/sv_user.c b/qw_server/sv_user.c
index a8e5570..bb0f57c 100644
--- a/qw_server/sv_user.c
+++ b/qw_server/sv_user.c
@@ -573,11 +573,8 @@ SV_NextUpload
 */
 void SV_NextUpload (void)
 {
-	byte	buffer[1024];
-	int		r;
 	int		percent;
 	int		size;
-	client_t *client;
 
 	if (!*host_client->uploadfn) {
 		SV_ClientPrintf(host_client, PRINT_HIGH, "Upload denied\n");
@@ -914,8 +911,6 @@ SV_Pause_f
 */
 void SV_Pause_f (void)
 {
-	int i;
-	client_t *cl;
 	char st[sizeof(host_client->name) + 32];
 
 	if (!pausable.value) {
diff --git a/qw_server/sys_unix.c b/qw_server/sys_unix.c
index dbd9f45..7ad0030 100644
--- a/qw_server/sys_unix.c
+++ b/qw_server/sys_unix.c
@@ -212,7 +212,7 @@ void Sys_Init (void)
 main
 =============
 */
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	double			time, oldtime, newtime;
 	quakeparms_t	parms;
@@ -279,5 +279,6 @@ void main(int argc, char *argv[])
 		if (sys_extrasleep.value)
 			usleep (sys_extrasleep.value);
 	}	
+	exit(0);
 }