move the api headers into include/QF and clean up (most of) the resulting mess.

target specific files that I don't build won't compile yet. just put QF/
infront of the offending headers.

Also move ver_check into libqfutils

qw/source/Makefile.am

@@ -83,7 +83,7 @@ endif
 server_SOURCES=	sv_ccmds.c sv_cvar.c \
 		sv_ents.c sv_init.c sv_main.c sv_misc.c sv_model.c \
 		sv_move.c sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \
-		sv_user.c ver_check.c world.c $(world_ASM)
+		sv_user.c world.c $(world_ASM)
 
 qw_server_SOURCES=	$(common_SOURCES) $(server_SOURCES)
 qw_server_LDADD=	-L. -L../../libs -lqfnet -lqfsys_sv -lqfgamecode -lqfutil $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)

qw/source/cd_linux.c

@@ -52,10 +52,10 @@
 #include <time.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
-#include "qargs.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/qargs.h"
 #include "sound.h"
 
 static qboolean cdValid = false;

qw/source/cl_cam.c

@@ -46,8 +46,8 @@
 #include "cl_cam.h"
 #include "client.h"
 #include "commdef.h"
-#include "console.h"
-#include "msg.h"
+#include "QF/console.h"
+#include "QF/msg.h"
 #include "pmove.h"
 #include "sbar.h"
 

qw/source/cl_cmd.c

@@ -37,9 +37,9 @@
 #endif
 
 #include "client.h"
-#include "console.h"
-#include "cmd.h"
-#include "msg.h"
+#include "QF/console.h"
+#include "QF/cmd.h"
+#include "QF/msg.h"
 #include "teamplay.h"
 
 /*

qw/source/cl_cvar.c

@@ -31,9 +31,9 @@
 #endif
 
 #include "client.h"
-#include "cvar.h"
-#include "msg.h"
-#include "va.h"
+#include "QF/cvar.h"
+#include "QF/msg.h"
+#include "QF/va.h"
 
 void
 Cvar_Info (cvar_t *var)

qw/source/cl_demo.c

@@ -36,16 +36,16 @@
 # include <strings.h>
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "cl_main.h"
 #include "client.h"
-#include "cmd.h"
+#include "QF/cmd.h"
 #include "host.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "pmove.h"
-#include "qendian.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/qendian.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 
 void        CL_FinishTimeDemo (void);
 

qw/source/cl_ents.c

@@ -41,10 +41,10 @@
 #include "cl_main.h"
 #include "cl_pred.h"
 #include "cl_tent.h"
-#include "console.h"
+#include "QF/console.h"
 #include "d_iface.h"
 #include "host.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "msg_ucmd.h"
 #include "pmove.h"
 #include "r_dynamic.h"

qw/source/cl_input.c

@@ -36,18 +36,18 @@
 # include <strings.h>
 #endif
 
-#include "checksum.h"
+#include "QF/checksum.h"
 #include "cl_cam.h"
 #include "cl_demo.h"
 #include "cl_input.h"
 #include "cl_parse.h"
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "host.h"
 #include "input.h"
-#include "keys.h"
-#include "msg.h"
+#include "QF/keys.h"
+#include "QF/msg.h"
 #include "msg_ucmd.h"
 #include "teamplay.h"
 #include "view.h"

qw/source/cl_main.c

@@ -71,29 +71,29 @@
 #include "cl_slist.h"
 #include "cl_tent.h"
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "draw.h"
 #include "host.h"
 #include "input.h"
-#include "keys.h"
+#include "QF/keys.h"
 #include "model.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "net.h"
 #include "pmove.h"
-#include "qendian.h"
-#include "quakefs.h"
-#include "qargs.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
+#include "QF/qargs.h"
 #include "sbar.h"
 #include "screen.h"
 #include "skin.h"
 #include "sound.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "teamplay.h"
 #include "vid.h"
 #include "view.h"
-#include "va.h"
+#include "QF/va.h"
 
 void        CL_RemoveQFInfoKeys ();
 

qw/source/cl_misc.c

@@ -33,7 +33,7 @@
 #include <stdarg.h>
 
 #include "host.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 qboolean
 ServerPaused (void)

qw/source/cl_parse.c

@@ -51,10 +51,10 @@
 #include "cl_parse.h"
 #include "cl_tent.h"
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "host.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "pmove.h"
 #include "protocol.h"
 #include "screen.h"
@@ -62,7 +62,7 @@
 #include "skin.h"
 #include "sound.h"
 #include "teamplay.h"
-#include "va.h"
+#include "QF/va.h"
 #include "view.h"
 
 extern cvar_t *gl_dlight_polyblend;

qw/source/cl_pred.c

@@ -36,8 +36,8 @@
 #include "cl_ents.h"
 #include "client.h"
 #include "commdef.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "pmove.h"
 
 cvar_t     *cl_nopred;

qw/source/cl_slist.c

@@ -48,9 +48,9 @@
 #include "bothdefs.h"
 #include "cl_slist.h"
 #include "commdef.h"
-#include "console.h"
-#include "quakefs.h"
-#include "va.h"
+#include "QF/console.h"
+#include "QF/quakefs.h"
+#include "QF/va.h"
 
 server_entry_t *slist;
 

qw/source/cl_sys_unix.c

@@ -44,10 +44,10 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "host.h"
-#include "qargs.h"
-#include "sys.h"
+#include "QF/qargs.h"
+#include "QF/sys.h"
 
 int         noconinput = 0;
 qboolean    is_server = false;

qw/source/cl_tent.c

@@ -43,10 +43,10 @@
 #include "cl_main.h"
 #include "cl_tent.h"
 #include "client.h"
-#include "console.h"
+#include "QF/console.h"
 #include "host.h"
 #include "model.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "r_dynamic.h"
 #include "sound.h"
 

qw/source/com.c

@@ -32,12 +32,12 @@
 
 #include <ctype.h>
 
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
-#include "qendian.h"
-#include "quakefs.h"
-#include "sys.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
 
 cvar_t     *registered;
 

qw/source/console.c

@@ -39,16 +39,16 @@
 #include <stdarg.h>
 
 #include "client.h"
-#include "cmd.h"
+#include "QF/cmd.h"
 #include "commdef.h"
-#include "console.h"
+#include "QF/console.h"
 #include "draw.h"
 #include "input.h"
-#include "keys.h"
-#include "qargs.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
 #include "screen.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 
 int         con_ormask;
 console_t   con_main;

qw/source/context_x11.c

@@ -61,15 +61,15 @@
 #endif
 
 #include "commdef.h"
-#include "console.h"
+#include "QF/console.h"
 #include "context_x11.h"
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "dga_check.h"
 #include "input.h"
-#include "qargs.h"
-#include "qtypes.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/qargs.h"
+#include "QF/qtypes.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 #include "vid.h"
 
 static void (*event_handlers[LASTEvent]) (XEvent *);

qw/source/d_modech.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "d_local.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 int         d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle;
 

qw/source/d_surf.c

@@ -33,9 +33,9 @@
 #include <stdlib.h>
 
 #include "d_local.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 #include "r_local.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 float       surfscale;
 qboolean    r_cache_thrash;				// set if surface cache is thrashing

qw/source/dga_check.c

@@ -52,7 +52,7 @@
 # include <X11/extensions/xf86vmstr.h>
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "dga_check.h"
 
 

qw/source/draw.c

@@ -37,12 +37,12 @@
 #endif
 
 #include "client.h"
-#include "console.h"
+#include "QF/console.h"
 #include "d_iface.h"
 #include "draw.h"
-#include "quakefs.h"
+#include "QF/quakefs.h"
 #include "sound.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 typedef struct {
 	vrect_t     rect;

qw/source/gl_draw.c

@@ -38,13 +38,13 @@
 
 #include <stdio.h>
 
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "draw.h"
 #include "glquake.h"
 #include "sbar.h"
 #include "screen.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 
 extern byte *host_basepal;

qw/source/gl_dyn_fires.c

@@ -39,8 +39,8 @@
 #include <stdlib.h>
 
 #include "cl_main.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "glquake.h"
 
 #define MAX_FIRES				128		// rocket flames

qw/source/gl_dyn_part.c

@@ -38,13 +38,13 @@
 
 #include <stdlib.h>
 
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "glquake.h"
 #include "host.h"
 #include "r_dynamic.h"
-#include "qargs.h"
-#include "sys.h"
+#include "QF/qargs.h"
+#include "QF/sys.h"
 
 typedef enum {
 	pt_static, pt_grav, pt_blob, pt_blob2,

qw/source/gl_mesh.c

@@ -38,10 +38,10 @@
 
 #include <stdio.h>
 
-#include "console.h"
-#include "mdfour.h"
+#include "QF/console.h"
+#include "QF/mdfour.h"
 #include "model.h"
-#include "quakefs.h"
+#include "QF/quakefs.h"
 
 /*
 	ALIAS MODEL DISPLAY LIST GENERATION

qw/source/gl_model_alias.c

@@ -39,10 +39,10 @@
 # include <strings.h>
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "glquake.h"
 #include "model.h"
-#include "qendian.h"
+#include "QF/qendian.h"
 #include "server.h"
 #include "skin.h"
 

qw/source/gl_model_brush.c

@@ -39,11 +39,11 @@
 # include <strings.h>
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "glquake.h"
 #include "model.h"
-#include "qendian.h"
-#include "quakefs.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
 
 int         Mod_Fullbright (byte * skin, int width, int height, char *name);
 

qw/source/gl_model_fullbright.c

@@ -33,12 +33,12 @@
 # include "config.h"
 #endif
 
-#include "checksum.h"
-#include "console.h"
+#include "QF/checksum.h"
+#include "QF/console.h"
 #include "glquake.h"
-#include "qendian.h"
+#include "QF/qendian.h"
 #include "r_local.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 int
 Mod_CalcFullbright (byte *in, byte *out, int pixels)

qw/source/gl_model_sprite.c

@@ -41,7 +41,7 @@
 
 #include "glquake.h"
 #include "model.h"
-#include "qendian.h"
+#include "QF/qendian.h"
 
 extern model_t *loadmodel;
 extern char loadname[];

qw/source/gl_ngraph.c

@@ -39,7 +39,7 @@
 #include <stdio.h>
 
 #include "cl_parse.h"
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "draw.h"
 #include "glquake.h"
 #include "sbar.h"

qw/source/gl_rmain.c

@@ -45,15 +45,15 @@
 #include "cl_main.h"
 #include "cl_parse.h" //FIXME CL_NewTranslation
 #include "commdef.h"
-#include "console.h"
+#include "QF/console.h"
 #include "locs.h"
 #include "glquake.h"
-#include "mathlib.h"
-#include "qargs.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
 #include "r_dynamic.h"
 #include "skin.h"
 #include "sound.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "view.h"
 
 entity_t	r_worldentity;

qw/source/gl_rmisc.c

@@ -38,13 +38,13 @@
 
 #include <stdio.h>
 
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "glquake.h"
 #include "r_dynamic.h"
 #include "skin.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "vid.h"
 
 qboolean VID_Is8bit (void);

qw/source/gl_rsurf.c

@@ -41,7 +41,7 @@
 #include <stdio.h>
 
 #include "glquake.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 qboolean    r_cache_thrash;
 

qw/source/gl_screen.c

@@ -39,16 +39,16 @@
 #include <time.h>
 
 #include "cl_parse.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "draw.h"
 #include "glquake.h"
 #include "host.h"
-#include "keys.h"
+#include "QF/keys.h"
 #include "pcx.h"
 #include "sbar.h"
 #include "skin.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "tga.h"
 #include "view.h"
 

qw/source/gl_skin.c

@@ -34,7 +34,7 @@
 #include "host.h"
 #include "protocol.h"
 #include "skin.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "texture.h"
 
 byte        player_8bit_texels[320 * 200];

qw/source/gl_sky.c

@@ -36,7 +36,7 @@
 # include <strings.h>
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "glquake.h"
 #include "tga.h"
 #include "view.h"

qw/source/gl_sky_clip.c

@@ -38,9 +38,9 @@
 
 #include <stdarg.h>
 
-#include "console.h"
+#include "QF/console.h"
 #include "glquake.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "view.h"
 
 extern qboolean skyloaded;

qw/source/gl_textures.c

@@ -39,14 +39,14 @@
 
 #include <stdio.h>
 
-#include "cmd.h"
-#include "console.h"
-#include "crc.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/crc.h"
 #include "draw.h"
 #include "glquake.h"
 #include "sbar.h"
 #include "screen.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 extern unsigned char d_15to8table[65536];
 extern cvar_t *gl_picmip;

qw/source/gl_warp.c

@@ -30,9 +30,9 @@
 # include "config.h"
 #endif
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "glquake.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 extern double realtime;
 extern model_t *loadmodel;

qw/source/in_sdl.c

@@ -34,16 +34,16 @@
 #include "client.h"
 #include "cl_input.h"
 #include "cl_main.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "draw.h"
 #include "host.h"
 #include "input.h"
 #include "joystick.h"
-#include "keys.h"
-#include "sys.h"
-#include "qargs.h"
-#include "qendian.h"
+#include "QF/keys.h"
+#include "QF/sys.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
 #include "vid.h"
 #include "view.h"
 

qw/source/in_svgalib.c

@@ -44,15 +44,15 @@
 
 #include "cl_input.h"
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "host.h"
 #include "input.h"
 #include "joystick.h"
-#include "keys.h"
-#include "qargs.h"
-#include "sys.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
+#include "QF/sys.h"
 #include "view.h"
 
 static int  UseKeyboard = 1;

qw/source/in_x11.c

@@ -57,17 +57,17 @@
 
 #include "cl_input.h"
 #include "client.h"
-#include "console.h"
+#include "QF/console.h"
 #include "context_x11.h"
-#include "cmd.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/cvar.h"
 #include "dga_check.h"
 #include "host.h"
 #include "input.h"
 #include "joystick.h"
-#include "keys.h"
-#include "qargs.h"
-#include "sys.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
+#include "QF/sys.h"
 #include "view.h"
 
 cvar_t     *_windowed_mouse;

qw/source/joy_linux.c

@@ -35,10 +35,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "console.h"
+#include "QF/console.h"
 #include "client.h"
-#include "cvar.h"
-#include "keys.h"
+#include "QF/cvar.h"
+#include "QF/keys.h"
 #include "protocol.h"
 #include "view.h"
 

qw/source/keys.c

@@ -43,12 +43,12 @@
 #include <ctype.h>
 
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
-#include "keys.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/keys.h"
 #include "screen.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 /*
 

qw/source/locs.c

@@ -39,11 +39,11 @@
 #include <limits.h>
 
 #include "client.h"
-#include "console.h"
+#include "QF/console.h"
 #include "locs.h"
-#include "quakefs.h"
-#include "qtypes.h"
-#include "sys.h"
+#include "QF/quakefs.h"
+#include "QF/qtypes.h"
+#include "QF/sys.h"
 
 #define LOCATION_BLOCK	128				// 128 locations per block.
 

qw/source/model.c

@@ -39,10 +39,10 @@
 # include <strings.h>
 #endif
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "model.h"
-#include "qendian.h"
-#include "quakefs.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
 #include "server.h"
 
 void        Mod_LoadAliasModel (model_t *mod, void *buf);

qw/source/model_alias.c

@@ -41,12 +41,12 @@
 
 #include "cl_main.h"
 #include "client.h"
-#include "crc.h"
-#include "info.h"
+#include "QF/crc.h"
+#include "QF/info.h"
 #include "model.h"
-#include "msg.h"
-#include "qendian.h"
-#include "quakefs.h"
+#include "QF/msg.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
 #include "r_local.h"
 #include "server.h"
 

qw/source/model_brush.c

@@ -42,10 +42,10 @@
 #include <math.h>
 
 
-#include "checksum.h"
-#include "cvar.h"
+#include "QF/checksum.h"
+#include "QF/cvar.h"
 #include "model.h"
-#include "qendian.h"
+#include "QF/qendian.h"
 #include "server.h"
 
 extern model_t *loadmodel;

qw/source/model_sprite.c

@@ -35,7 +35,7 @@
 
 #include "model.h"
 #include "server.h"
-#include "qendian.h"
+#include "QF/qendian.h"
 
 extern model_t *loadmodel;
 extern char loadname[];

qw/source/msg_ucmd.c

@@ -36,11 +36,11 @@
 # include <strings.h>
 #endif
 
-#include "msg.h"
+#include "QF/msg.h"
 #include "net.h"
 #include "protocol.h"
-#include "qendian.h"
-#include "sys.h"
+#include "QF/qendian.h"
+#include "QF/sys.h"
 
 struct usercmd_s nullcmd;
 

qw/source/net_chan.c

@@ -46,9 +46,9 @@
 
 #include "client.h"
 #include "commdef.h"
-#include "console.h"
-#include "cvar.h"
-#include "msg.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/msg.h"
 #include "net.h"
 
 #define	PACKET_HEADER	8

qw/source/net_udp.c

@@ -68,11 +68,11 @@
 # include <libc.h>
 #endif
 
-#include "console.h"
-#include "msg.h"
+#include "QF/console.h"
+#include "QF/msg.h"
 #include "net.h"
-#include "sys.h"
-#include "qargs.h"
+#include "QF/sys.h"
+#include "QF/qargs.h"
 
 #ifdef _WIN32
 # include <windows.h>

qw/source/pcx.c

@@ -37,14 +37,14 @@
 #endif
 
 #include "cl_parse.h"
-#include "console.h"
+#include "QF/console.h"
 #include "host.h"
 #include "pcx.h"
-#include "qendian.h"
-#include "qtypes.h"
-#include "quakefs.h"
+#include "QF/qendian.h"
+#include "QF/qtypes.h"
+#include "QF/quakefs.h"
 #include "texture.h"
-#include "zone.h"
+#include "QF/zone.h"
 
 /*
 	LoadPCX

qw/source/pmove.c

@@ -33,10 +33,10 @@
 #include <math.h>
 
 #include "client.h"
-#include "compat.h"
-#include "cvar.h"
+#include "QF/compat.h"
+#include "QF/cvar.h"
 #include "pmove.h"
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 cvar_t     *no_pogo_stick;
 movevars_t  movevars;

qw/source/pmovetst.c

@@ -36,11 +36,11 @@
 # include <strings.h>
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "model.h"
 #include "pmove.h"
-#include "qtypes.h"
-#include "sys.h"
+#include "QF/qtypes.h"
+#include "QF/sys.h"
 
 static hull_t box_hull;
 static dclipnode_t box_clipnodes[6];

qw/source/qfgl_ext.c

@@ -65,7 +65,7 @@
 #endif
 
 #include "qfgl_ext.h"
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 /*
 	ParseExtensionList

qw/source/quakefs.c

@@ -61,20 +61,20 @@
 
 #include <limits.h>
 
-#include "cmd.h"
+#include "QF/cmd.h"
 #include "commdef.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "draw.h"
-#include "hash.h"
-#include "info.h"
-#include "qargs.h"
-#include "qendian.h"
-#include "qtypes.h"
-#include "quakefs.h"
+#include "QF/hash.h"
+#include "QF/info.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
+#include "QF/qtypes.h"
+#include "QF/quakefs.h"
 #include "server.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 
 #ifndef HAVE_FNMATCH_PROTO
 int         fnmatch (const char *__pattern, const char *__string, int __flags);

qw/source/quakeio.c

@@ -57,8 +57,8 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include "quakefs.h"
-#include "quakeio.h"
+#include "QF/quakefs.h"
+#include "QF/quakeio.h"
 
 #ifdef WIN32
 # ifndef __BORLANDC__

qw/source/r_alias.c

@@ -30,11 +30,11 @@
 # include "config.h"
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "d_ifacea.h"
 #include "r_local.h"
 #include "skin.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "texture.h"
 
 #define LIGHT_MIN	5					// lowest light value we'll allow, to 

qw/source/r_bsp.c

@@ -32,9 +32,9 @@
 
 #include <math.h>
 
-#include "console.h"
+#include "QF/console.h"
 #include "r_local.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 //
 // current entity info

qw/source/r_efrag.c

@@ -33,9 +33,9 @@
 #include "bothdefs.h"
 #include "cl_main.h"
 #include "cl_tent.h"
-#include "console.h"
+#include "QF/console.h"
 #include "r_local.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 mnode_t    *r_pefragtopnode;
 

qw/source/r_main.c

@@ -41,15 +41,15 @@
 #include "bothdefs.h"
 #include "cl_cam.h"
 #include "cl_main.h"
-#include "console.h"
-#include "cmd.h"
+#include "QF/console.h"
+#include "QF/cmd.h"
 #include "locs.h"
-#include "mathlib.h"
+#include "QF/mathlib.h"
 #include "r_dynamic.h"
 #include "r_local.h"
 #include "screen.h"
 #include "sound.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "view.h"
 
 //define    PASSAGES

qw/source/r_misc.c

@@ -30,14 +30,14 @@
 # include "config.h"
 #endif
 
-#include "console.h"
-#include "cmd.h"
+#include "QF/console.h"
+#include "QF/cmd.h"
 #include "cl_parse.h"
 #include "draw.h"
 #include "host.h"
 #include "r_local.h"
 #include "sbar.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 qboolean    allowskybox;				// whether or not to allow skyboxes
 

qw/source/r_part.c

@@ -32,10 +32,10 @@
 
 #include <stdlib.h>
 
-#include "console.h"
+#include "QF/console.h"
 #include "host.h"
-#include "qargs.h"
-#include "quakefs.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
 #include "r_dynamic.h"
 #include "r_local.h"
 

qw/source/r_sprite.c

@@ -38,9 +38,9 @@
 
 #include <math.h>
 
-#include "console.h"
+#include "QF/console.h"
 #include "r_local.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 static int  clip_current;
 static vec5_t clip_verts[2][MAXWORKINGVERTS];

qw/source/r_surf.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "r_local.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 drawsurf_t  r_drawsurf;
 

qw/source/r_view.c

@@ -35,10 +35,10 @@
 
 #include "bothdefs.h"
 #include "client.h"
-#include "cmd.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/cvar.h"
 #include "host.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "pmove.h"
 #include "screen.h"
 #include "vid.h"

qw/source/sbar.c

@@ -41,13 +41,13 @@
 #include "bothdefs.h"
 #include "cl_cam.h"
 #include "client.h"
-#include "cmd.h"
+#include "QF/cmd.h"
 #include "commdef.h"
 #include "draw.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "sbar.h"
 #include "screen.h"
-#include "va.h"
+#include "QF/va.h"
 #include "vid.h"
 
 int         sb_updates;					// if >= vid.numpages, no update

qw/source/screen.c

@@ -40,16 +40,16 @@
 
 #include "cl_parse.h"
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "d_iface.h"
 #include "draw.h"
 #include "host.h"
-#include "keys.h"
+#include "QF/keys.h"
 #include "pcx.h"
 #include "sbar.h"
 #include "skin.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "vid.h"
 #include "view.h"
 

qw/source/skin.c

@@ -38,17 +38,17 @@
 
 #include "cl_parse.h"
 #include "client.h"
-#include "console.h"
-#include "cmd.h"
+#include "QF/console.h"
+#include "QF/cmd.h"
 #include "host.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "pcx.h"
-#include "qendian.h"
+#include "QF/qendian.h"
 #include "screen.h"
 #include "skin.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "texture.h"
-#include "va.h"
+#include "QF/va.h"
 
 cvar_t     *baseskin;
 cvar_t     *noskins;

qw/source/snd_alsa_0_9.c

@@ -35,10 +35,10 @@
 
 #include <sys/asoundlib.h>
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 #include "sound.h"
-#include "qargs.h"
-#include "console.h"
+#include "QF/qargs.h"
+#include "QF/console.h"
 
 static int  snd_inited;
 

qw/source/snd_dma.c

@@ -39,12 +39,12 @@
 #include <stdlib.h>
 
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "host.h"
 #include "model.h"
-#include "qargs.h"
-#include "sys.h"
+#include "QF/qargs.h"
+#include "QF/sys.h"
 #include "sound.h"
 
 #ifdef _WIN32

qw/source/snd_mem.c

@@ -36,11 +36,11 @@
 # include <strings.h>
 #endif
 
-#include "console.h"
-#include "qendian.h"
-#include "quakefs.h"
+#include "QF/console.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
 #include "sound.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 int         cache_full_cycle;
 

qw/source/snd_mix.c

@@ -36,7 +36,7 @@
 # include <strings.h>
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "sound.h"
 
 #ifdef _WIN32

qw/source/sv_ccmds.c

@@ -39,15 +39,15 @@
 #include <stdlib.h>
 
 #include "bothdefs.h"
-#include "cmd.h"
-#include "msg.h"
-#include "qargs.h"
-#include "qendian.h"
-#include "quakefs.h"
+#include "QF/cmd.h"
+#include "QF/msg.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
 #include "server.h"
 #include "sv_progs.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 
 qboolean    sv_allow_cheats;
 

qw/source/sv_cvar.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "server.h"
 
 void        SV_SendServerInfoChange (char *key, char *value);

qw/source/sv_ents.c

@@ -36,11 +36,11 @@
 # include <strings.h>
 #endif
 
-#include "msg.h"
+#include "QF/msg.h"
 #include "msg_ucmd.h"
 #include "server.h"
 #include "sv_progs.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 /*
 	The PVS must include a small area around the client to allow head

qw/source/sv_init.c

@@ -36,13 +36,13 @@
 # include <strings.h>
 #endif
 
-#include "crc.h"
-#include "msg.h"
-#include "quakefs.h"
+#include "QF/crc.h"
+#include "QF/msg.h"
+#include "QF/quakefs.h"
 #include "server.h"
 #include "sv_progs.h"
 #include "world.h"
-#include "va.h"
+#include "QF/va.h"
 
 server_t    sv;							// local server
 

qw/source/sv_main.c

@@ -41,19 +41,19 @@
 
 #include "bothdefs.h"
 #include "buildnum.h"
-#include "cmd.h"
+#include "QF/cmd.h"
 #include "model.h"
 #include "net.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "pmove.h"
-#include "qargs.h"
-#include "quakefs.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
 #include "server.h"
 #include "sv_progs.h"
-#include "sys.h"
-#include "va.h"
-#include "ver_check.h"
-#include "zone.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/ver_check.h"
+#include "QF/zone.h"
 
 quakeparms_t host_parms;
 qboolean    host_initialized;			// true if into command execution

qw/source/sv_model.c

@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "model.h"
 
 const int   mod_lightmap_bytes = 1;

qw/source/sv_move.c

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 #include "pmove.h"
 #include "server.h"
 #include "sv_pr_cmds.h"

qw/source/sv_nchan.c

@@ -36,7 +36,7 @@
 # include <strings.h>
 #endif
 
-#include "msg.h"
+#include "QF/msg.h"
 #include "server.h"
 
 // check to see if client block will fit, if not, rotate buffers

qw/source/sv_phys.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "pmove.h"
 #include "server.h"
 #include "sv_progs.h"

qw/source/sv_pr_cmds.c

@@ -33,13 +33,13 @@
 # include <string.h>
 #endif
 
-#include "cmd.h"
-#include "msg.h"
+#include "QF/cmd.h"
+#include "QF/msg.h"
 #include "server.h"
 #include "sv_pr_cmds.h"
 #include "sv_progs.h"
 #include "world.h"
-#include "va.h"
+#include "QF/va.h"
 
 #define	RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].int_var = EDICT_TO_PROG(p, e))
 #define	RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].int_var = PR_SetString((p), s))

qw/source/sv_progs.c

@@ -37,7 +37,7 @@
 #include "strings.h"
 #endif
 
-#include "cmd.h"
+#include "QF/cmd.h"
 #include "server.h"
 #include "progdefs.h"
 #include "sv_progs.h"

qw/source/sv_send.c

@@ -38,10 +38,10 @@
 #include <time.h>
 
 #include "bothdefs.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "server.h"
 #include "sv_progs.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 #define CHAN_AUTO   0
 #define CHAN_WEAPON 1

qw/source/sv_sys_unix.c

@@ -45,10 +45,10 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "cvar.h"
-#include "qargs.h"
+#include "QF/cvar.h"
+#include "QF/qargs.h"
 #include "server.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 #ifdef NeXT
 # include <libc.h>

qw/source/sv_user.c

@@ -42,17 +42,17 @@
 #include <ctype.h>
 
 #include "bothdefs.h"
-#include "checksum.h"
-#include "cmd.h"
-#include "cvar.h"
-#include "msg.h"
+#include "QF/checksum.h"
+#include "QF/cmd.h"
+#include "QF/cvar.h"
+#include "QF/msg.h"
 #include "msg_ucmd.h"
 #include "pmove.h"
-#include "quakefs.h"
+#include "QF/quakefs.h"
 #include "server.h"
 #include "sv_progs.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 #include "world.h"
 
 edict_t    *sv_player;

qw/source/sw_model_alias.c

@@ -40,12 +40,12 @@
 #include <strings.h>
 #endif
 
-#include "checksum.h"
+#include "QF/checksum.h"
 #include "d_iface.h"
 #include "model.h"
-#include "qendian.h"
+#include "QF/qendian.h"
 #include "server.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 extern char loadname[];
 extern model_t *loadmodel;

qw/source/sw_model_sprite.c

@@ -41,7 +41,7 @@
 
 #include "d_iface.h"
 #include "model.h"
-#include "qendian.h"
+#include "QF/qendian.h"
 #include "server.h"
 
 extern model_t *loadmodel;

qw/source/sw_skin.c

@@ -40,7 +40,7 @@
 #include "client.h"
 #include "host.h"
 #include "skin.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "vid.h"
 
 void

qw/source/sys_unix.c

@@ -44,11 +44,11 @@
 #include <strings.h>
 #endif
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "host.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 #include "server.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 cvar_t     *sys_nostdout;
 

qw/source/teamplay.c

@@ -39,12 +39,12 @@
 #include <errno.h>
 
 #include "bothdefs.h"
-#include "console.h"
-#include "cmd.h"
+#include "QF/console.h"
+#include "QF/cmd.h"
 #include "client.h"
 #include "locs.h"
 #include "model.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "teamplay.h"
 
 extern cvar_t *skin;

qw/source/tga.c

@@ -36,9 +36,9 @@
 # include <strings.h>
 #endif
 
-#include "qendian.h"
-#include "quakefs.h"
-#include "sys.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
 #include "tga.h"
 
 static int

qw/source/ver_check.c

@@ -1,104 +0,0 @@
-/*
-	ver_check.c
-
-	Version number comparisons
-
-	Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
-	Copyright (C) 2000 Jeff Teunissen <deek@dusknet.dhs.org>
-
-	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:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-	$Id$
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-
-/*
-	ver_compare
-
-	Compare two ASCII version strings. If the first is greater than the second,
-	return a positive number. If the second is greater, return a negative. If
-	they are equal, return zero.
-*/
-int
-ver_compare (const char *value, const char *reference)
-{
-	const char *valptr, *refptr;
-	int         vc, rc;
-	long        vl, rl;
-
-	if (!value)
-		value = "";
-	if (!reference)
-		reference = "";
-
-	for (;;) {
-		valptr = value;
-		while (*valptr && !isdigit ((int) *valptr))	// Scan past any non-digits
-			valptr++;
-
-		refptr = reference;
-		while (*refptr && !isdigit ((int) *refptr))	// get past non-digits
-			refptr++;
-
-		for (;;) {
-			vc = (value == valptr) ? 0 : *value++;
-			rc = (reference == refptr) ? 0 : *reference++;
-
-			if ((!vc) && (!rc))
-				break;
-
-			if (vc && !isalpha (vc))
-				vc += 256;				// ASCII charset
-			if (rc && !isalpha (rc))
-				rc += 256;
-
-			if (vc != rc)
-				return (vc - rc);
-		}
-
-		value = valptr;
-		reference = refptr;
-
-		vl = rl = 0;
-
-		if (isdigit ((int) *valptr))
-			vl = strtol (value, (char **) &value, 10);
-
-		if (isdigit ((int) *refptr))
-			rl = strtol (reference, (char **) &reference, 10);
-
-		if (vl != rl)
-			return (vl - rl);
-
-		if ((!*value) && (!*reference))
-			return 0;
-
-		if (!*value)
-			return -1;
-
-		if (!*reference)
-			return 1;
-	}
-}

qw/source/vid.c

@@ -30,11 +30,11 @@
 # include "config.h"
 #endif
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "vid.h"
-#include "va.h"
-#include "qargs.h"
-#include "sys.h"
+#include "QF/va.h"
+#include "QF/qargs.h"
+#include "QF/sys.h"
 
 extern viddef_t vid;					// global video state
 

qw/source/vid_common_gl.c

@@ -44,12 +44,12 @@
 
 #include <GL/gl.h>
 
-#include "console.h"
+#include "QF/console.h"
 #include "glquake.h"
 #include "input.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 #include "qfgl_ext.h"
-#include "quakefs.h"
+#include "QF/quakefs.h"
 #include "sbar.h"
 
 #define WARP_WIDTH              320

qw/source/vid_glx.c

@@ -46,16 +46,16 @@
 # include <X11/extensions/xf86dga.h>
 #endif
 
-#include "console.h"
+#include "QF/console.h"
 #include "context_x11.h"
 #include "glquake.h"
 #include "host.h"
 #include "input.h"
-#include "qargs.h"
-#include "qendian.h"
-#include "quakefs.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
 #include "sbar.h"
-#include "va.h"
+#include "QF/va.h"
 
 #define WARP_WIDTH		320
 #define WARP_HEIGHT 	200

qw/source/vid_sdl.c

@@ -38,13 +38,13 @@
 
 #include <SDL.h>
 
-#include "console.h"
-#include "cvar.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "d_local.h"
 #include "host.h"
-#include "qendian.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/qendian.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 #include "vid.h"
 
 #ifdef WIN32