From 05adfd0e53b4781415506828ec1f4c4d33fa910e Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Wed, 30 May 2001 04:34:06 +0000 Subject: [PATCH] quakefs.h -> vfs.h quakeio.h -> vfile.h More diff reduction between trunk and my VFS code. Also took the time to put some headers in order and fix a few #include's pointed out by moving things around a bit. --- include/QF/Makefile.am | 7 +++---- include/QF/cvar.h | 2 +- include/QF/keys.h | 2 +- include/QF/pcx.h | 2 +- include/QF/progs.h | 2 +- include/QF/tga.h | 1 + include/QF/{quakeio.h => vfile.h} | 0 include/QF/{quakefs.h => vfs.h} | 2 +- include/gib_modules.h | 2 +- libs/audio/targets/snd_mem.c | 2 +- libs/gamecode/pr_edict.c | 2 +- libs/gib/gib.c | 2 +- libs/gib/gib_modules.c | 2 +- libs/models/alias/gl_mesh.c | 2 +- libs/models/alias/model_alias.c | 2 +- libs/models/brush/gl_model_brush.c | 2 +- libs/models/model.c | 2 +- libs/util/cmd.c | 2 +- libs/util/cvar.c | 1 + libs/util/quakefs.c | 2 +- libs/util/quakeio.c | 4 ++-- libs/video/renderer/gl/gl_draw.c | 2 +- libs/video/renderer/gl/gl_dyn_part.c | 2 +- libs/video/renderer/gl/gl_rmisc.c | 2 +- libs/video/renderer/gl/gl_screen.c | 2 +- libs/video/renderer/gl/gl_sky.c | 2 +- libs/video/renderer/sw/draw.c | 2 +- libs/video/renderer/sw/screen.c | 2 +- libs/video/renderer/sw/sw_rpart.c | 2 +- libs/video/targets/vid_common_gl.c | 2 +- libs/video/targets/vid_glx.c | 1 - libs/video/targets/vid_wgl.c | 2 +- nq/include/client.h | 2 +- nq/include/server.h | 2 +- nq/source/com.c | 10 +++++----- nq/source/game.c | 2 +- nq/source/locs.c | 2 +- nq/source/net_main.c | 8 ++++---- nq/source/pcx.c | 2 +- nq/source/skin.c | 2 +- nq/source/sys_win.c | 4 ++-- nq/source/tga.c | 2 +- nq/source/wad.c | 2 +- qw/include/cl_slist.h | 2 +- qw/include/client.h | 2 +- qw/include/server.h | 2 +- qw/source/cl_main.c | 5 ++++- qw/source/cl_parse.c | 1 + qw/source/cl_slist.c | 2 +- qw/source/com.c | 2 +- qw/source/game.c | 2 +- qw/source/gl_dyn_part.c | 3 ++- qw/source/keys.c | 1 + qw/source/locs.c | 2 +- qw/source/net_packetlog.c | 2 +- qw/source/pcx.c | 2 +- qw/source/skin.c | 2 +- qw/source/sv_ccmds.c | 2 +- qw/source/sv_init.c | 4 ++-- qw/source/sv_main.c | 16 ++++++++-------- qw/source/sv_user.c | 12 ++++++------ qw/source/sw_rpart.c | 2 +- qw/source/tga.c | 2 +- qw/source/wad.c | 2 +- 64 files changed, 90 insertions(+), 84 deletions(-) rename include/QF/{quakeio.h => vfile.h} (100%) rename include/QF/{quakefs.h => vfs.h} (99%) diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am index 5c1957f45..a159b13cd 100644 --- a/include/QF/Makefile.am +++ b/include/QF/Makefile.am @@ -5,7 +5,6 @@ include_HEADERS = asm_i386.h bspfile.h cdaudio.h checksum.h cmd.h compat.h \ console.h crc.h cvar.h draw.h gcc_attr.h gib.h hash.h hl.h info.h \ input.h joystick.h keys.h link.h locs.h mathlib.h mdfour.h model.h \ modelgen.h msg.h pcx.h plugin.h pr_comp.h progs.h qargs.h qdefs.h \ - qendian.h qfgl_ext.h qfplist.h qtypes.h quakefs.h quakeio.h render.h \ - screen.h sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h \ - texture.h tga.h uint32.h va.h varrays.h ver_check.h vid.h wad.h \ - zone.h + qendian.h qfgl_ext.h qfplist.h qtypes.h render.h screen.h sizebuf.h \ + skin.h sound.h spritegn.h sys.h teamplay.h texture.h tga.h uint32.h \ + va.h varrays.h ver_check.h vfile.h vfs.h vid.h wad.h zone.h diff --git a/include/QF/cvar.h b/include/QF/cvar.h index 046e0b437..dd10e5b22 100644 --- a/include/QF/cvar.h +++ b/include/QF/cvar.h @@ -30,7 +30,7 @@ #define __cvar_h #include "QF/qtypes.h" -#include "QF/quakeio.h" +#include "QF/vfile.h" typedef struct cvar_s { diff --git a/include/QF/keys.h b/include/QF/keys.h index a19df875d..6b5bb2cd9 100644 --- a/include/QF/keys.h +++ b/include/QF/keys.h @@ -30,7 +30,7 @@ #ifndef _KEYS_H #define _KEYS_H -#include "QF/quakeio.h" +#include "QF/vfile.h" // these are the key numbers that should be passed to Key_Event diff --git a/include/QF/pcx.h b/include/QF/pcx.h index 71f8b5ef7..0900d3f6c 100644 --- a/include/QF/pcx.h +++ b/include/QF/pcx.h @@ -29,7 +29,7 @@ #ifndef __pcx_h #define __pcx_h -#include "QF/quakeio.h" +#include "QF/vfile.h" typedef struct { diff --git a/include/QF/progs.h b/include/QF/progs.h index 0acb91fef..5382ffe36 100644 --- a/include/QF/progs.h +++ b/include/QF/progs.h @@ -30,7 +30,7 @@ #define _PROGS_H #include "QF/link.h" -#include "QF/quakeio.h" +#include "QF/vfile.h" #include "QF/pr_comp.h" typedef union eval_s diff --git a/include/QF/tga.h b/include/QF/tga.h index 0fc7feb02..4e309044a 100644 --- a/include/QF/tga.h +++ b/include/QF/tga.h @@ -31,6 +31,7 @@ #include "QF/gcc_attr.h" #include "QF/qtypes.h" +#include "QF/vfile.h" #ifndef __GNUC__ # if defined (__BORLANDC__) || defined (_MSC_VER) diff --git a/include/QF/quakeio.h b/include/QF/vfile.h similarity index 100% rename from include/QF/quakeio.h rename to include/QF/vfile.h diff --git a/include/QF/quakefs.h b/include/QF/vfs.h similarity index 99% rename from include/QF/quakefs.h rename to include/QF/vfs.h index 615829cf1..1d57d32c6 100644 --- a/include/QF/quakefs.h +++ b/include/QF/vfs.h @@ -32,7 +32,7 @@ #define __quakefs_h #include "QF/qtypes.h" -#include "QF/quakeio.h" +#include "QF/vfile.h" #include "QF/cvar.h" //============================================================================ diff --git a/include/gib_modules.h b/include/gib_modules.h index b061b4df2..636f692c7 100644 --- a/include/gib_modules.h +++ b/include/gib_modules.h @@ -30,7 +30,7 @@ */ #include "QF/gib.h" -#include "QF/quakeio.h" +#include "QF/vfile.h" void GIB_Module_Load (char *name, VFile *f); gib_module_t *GIB_Create_Module (char *name); diff --git a/libs/audio/targets/snd_mem.c b/libs/audio/targets/snd_mem.c index 081fdae86..6becca99e 100644 --- a/libs/audio/targets/snd_mem.c +++ b/libs/audio/targets/snd_mem.c @@ -38,9 +38,9 @@ #include "QF/console.h" #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sound.h" #include "QF/sys.h" +#include "QF/vfs.h" int cache_full_cycle; diff --git a/libs/gamecode/pr_edict.c b/libs/gamecode/pr_edict.c index d1be30646..0f175ffae 100644 --- a/libs/gamecode/pr_edict.c +++ b/libs/gamecode/pr_edict.c @@ -47,10 +47,10 @@ #include "QF/progs.h" #include "QF/qdefs.h" #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sys.h" //XXX #include "QF/zone.h" #include "QF/va.h" +#include "QF/vfs.h" cvar_t *pr_boundscheck; cvar_t *pr_deadbeef; diff --git a/libs/gib/gib.c b/libs/gib/gib.c index 986b7ca6f..10eb25fc0 100644 --- a/libs/gib/gib.c +++ b/libs/gib/gib.c @@ -37,7 +37,7 @@ #include "QF/cmd.h" #include "QF/console.h" #include "QF/gib.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "gib_instructions.h" #include "gib_interpret.h" diff --git a/libs/gib/gib_modules.c b/libs/gib/gib_modules.c index fa9ab99c1..a3634f2b4 100644 --- a/libs/gib/gib_modules.c +++ b/libs/gib/gib_modules.c @@ -46,7 +46,7 @@ #include "QF/console.h" #include "QF/gib.h" -#include "QF/quakeio.h" +#include "QF/vfile.h" #include "gib_modules.h" diff --git a/libs/models/alias/gl_mesh.c b/libs/models/alias/gl_mesh.c index d6e23c6a9..bf66c4001 100644 --- a/libs/models/alias/gl_mesh.c +++ b/libs/models/alias/gl_mesh.c @@ -42,7 +42,7 @@ #include "QF/console.h" #include "QF/mdfour.h" #include "QF/model.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" /* ALIAS MODEL DISPLAY LIST GENERATION diff --git a/libs/models/alias/model_alias.c b/libs/models/alias/model_alias.c index c3cb03f04..596323475 100644 --- a/libs/models/alias/model_alias.c +++ b/libs/models/alias/model_alias.c @@ -45,8 +45,8 @@ #include "QF/model.h" #include "QF/msg.h" #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sys.h" +#include "QF/vfs.h" #include "d_iface.h" #include "r_local.h" diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c index a39cddda5..f1a282bcd 100644 --- a/libs/models/brush/gl_model_brush.c +++ b/libs/models/brush/gl_model_brush.c @@ -44,7 +44,7 @@ #include "glquake.h" #include "QF/model.h" #include "QF/qendian.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" int Mod_Fullbright (byte * skin, int width, int height, char *name); diff --git a/libs/models/model.c b/libs/models/model.c index 4d79c7234..b8311d0a7 100644 --- a/libs/models/model.c +++ b/libs/models/model.c @@ -43,8 +43,8 @@ #include "QF/cvar.h" #include "QF/model.h" #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sys.h" +#include "QF/vfs.h" void Mod_LoadAliasModel (model_t *mod, void *buf); void Mod_LoadSpriteModel (model_t *mod, void *buf); diff --git a/libs/util/cmd.c b/libs/util/cmd.c index 27f69049a..e60f5dfe4 100644 --- a/libs/util/cmd.c +++ b/libs/util/cmd.c @@ -45,9 +45,9 @@ #include "QF/hash.h" #include "QF/qargs.h" #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sizebuf.h" #include "QF/sys.h" +#include "QF/vfs.h" #include "QF/zone.h" #define MAX_ALIAS_NAME 32 diff --git a/libs/util/cvar.c b/libs/util/cvar.c index b34f8cbab..d4e82823c 100644 --- a/libs/util/cvar.c +++ b/libs/util/cvar.c @@ -47,6 +47,7 @@ #include "QF/cvar.h" #include "QF/hash.h" #include "QF/qargs.h" +#include "QF/vfs.h" #define USER_RO_CVAR "User-created READ-ONLY Cvar" #define USER_CVAR "User-created cvar" diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c index 58b52e5eb..5b44803ab 100644 --- a/libs/util/quakefs.c +++ b/libs/util/quakefs.c @@ -70,7 +70,7 @@ #include "QF/qargs.h" #include "QF/qendian.h" #include "QF/qtypes.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "QF/sys.h" #include "QF/va.h" #include "QF/zone.h" diff --git a/libs/util/quakeio.c b/libs/util/quakeio.c index 336642e2e..f579ab3bc 100644 --- a/libs/util/quakeio.c +++ b/libs/util/quakeio.c @@ -57,8 +57,8 @@ #include #include -#include "QF/quakefs.h" -#include "QF/quakeio.h" +#include "QF/vfs.h" +#include "QF/vfile.h" #ifdef WIN32 # ifndef __BORLANDC__ diff --git a/libs/video/renderer/gl/gl_draw.c b/libs/video/renderer/gl/gl_draw.c index 180ed4411..6ea2cbceb 100644 --- a/libs/video/renderer/gl/gl_draw.c +++ b/libs/video/renderer/gl/gl_draw.c @@ -41,12 +41,12 @@ #include "QF/cmd.h" #include "QF/console.h" #include "QF/draw.h" -#include "QF/quakefs.h" #include "QF/render.h" #include "QF/screen.h" #include "QF/sys.h" #include "QF/vid.h" #include "QF/va.h" +#include "QF/vfs.h" #include "glquake.h" #include "r_cvar.h" diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c index 498a048a1..afa1c58a2 100644 --- a/libs/video/renderer/gl/gl_dyn_part.c +++ b/libs/video/renderer/gl/gl_dyn_part.c @@ -42,10 +42,10 @@ #include "QF/compat.h" #include "QF/console.h" #include "QF/qargs.h" -#include "QF/quakefs.h" #include "QF/render.h" #include "QF/sys.h" #include "QF/varrays.h" +#include "QF/vfs.h" #include "glquake.h" #include "r_dynamic.h" diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c index 23f2a16a4..85dac796d 100644 --- a/libs/video/renderer/gl/gl_rmisc.c +++ b/libs/video/renderer/gl/gl_rmisc.c @@ -41,12 +41,12 @@ #include "QF/cmd.h" #include "QF/console.h" #include "QF/cvar.h" -#include "QF/quakefs.h" #include "QF/render.h" #include "QF/skin.h" #include "QF/sys.h" #include "QF/vid.h" #include "QF/varrays.h" +#include "QF/vfs.h" #include "glquake.h" #include "r_dynamic.h" diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c index f3c36c2b9..fdab6ca3b 100644 --- a/libs/video/renderer/gl/gl_screen.c +++ b/libs/video/renderer/gl/gl_screen.c @@ -44,12 +44,12 @@ #include "QF/draw.h" #include "QF/keys.h" #include "QF/pcx.h" -#include "QF/quakefs.h" // MAX_OSPATH #include "QF/render.h" // r_refdef #include "QF/screen.h" #include "QF/sys.h" #include "QF/texture.h" #include "QF/tga.h" +#include "QF/vfs.h" // MAX_OSPATH #include "glquake.h" #include "r_cvar.h" diff --git a/libs/video/renderer/gl/gl_sky.c b/libs/video/renderer/gl/gl_sky.c index a6de801ba..8f2346b2b 100644 --- a/libs/video/renderer/gl/gl_sky.c +++ b/libs/video/renderer/gl/gl_sky.c @@ -38,9 +38,9 @@ #include "QF/compat.h" #include "QF/console.h" -#include "QF/quakefs.h" #include "QF/render.h" #include "QF/tga.h" +#include "QF/vfs.h" #include "QF/vid.h" #include "glquake.h" diff --git a/libs/video/renderer/sw/draw.c b/libs/video/renderer/sw/draw.c index 728edf6b2..0986b8cf7 100644 --- a/libs/video/renderer/sw/draw.c +++ b/libs/video/renderer/sw/draw.c @@ -38,9 +38,9 @@ #include "QF/console.h" #include "QF/draw.h" -#include "QF/quakefs.h" #include "QF/sound.h" #include "QF/sys.h" +#include "QF/vfs.h" #include "d_iface.h" #include "r_cvar.h" diff --git a/libs/video/renderer/sw/screen.c b/libs/video/renderer/sw/screen.c index 0037b8aec..d2f0cfa0f 100644 --- a/libs/video/renderer/sw/screen.c +++ b/libs/video/renderer/sw/screen.c @@ -44,11 +44,11 @@ #include "QF/draw.h" #include "QF/keys.h" #include "QF/pcx.h" -#include "QF/quakefs.h" #include "QF/render.h" #include "QF/screen.h" #include "QF/sys.h" #include "QF/texture.h" +#include "QF/vfs.h" #include "QF/vid.h" #include "d_iface.h" diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c index ae458a2d9..3879c8e41 100644 --- a/libs/video/renderer/sw/sw_rpart.c +++ b/libs/video/renderer/sw/sw_rpart.c @@ -35,7 +35,7 @@ #include "QF/compat.h" #include "QF/console.h" #include "QF/qargs.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "QF/render.h" #include "r_cvar.h" diff --git a/libs/video/targets/vid_common_gl.c b/libs/video/targets/vid_common_gl.c index 6232e0db0..802681cb6 100644 --- a/libs/video/targets/vid_common_gl.c +++ b/libs/video/targets/vid_common_gl.c @@ -48,8 +48,8 @@ #include "QF/console.h" #include "QF/input.h" #include "QF/qargs.h" -#include "QF/quakefs.h" #include "QF/qfgl_ext.h" +#include "QF/vfs.h" #include "QF/vid.h" #include "glquake.h" #include "sbar.h" diff --git a/libs/video/targets/vid_glx.c b/libs/video/targets/vid_glx.c index 0ac9fa8b7..ed6ddedec 100644 --- a/libs/video/targets/vid_glx.c +++ b/libs/video/targets/vid_glx.c @@ -52,7 +52,6 @@ #include "QF/input.h" #include "QF/qargs.h" #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/va.h" #include "QF/vid.h" diff --git a/libs/video/targets/vid_wgl.c b/libs/video/targets/vid_wgl.c index e0e28739d..0ec968ce8 100644 --- a/libs/video/targets/vid_wgl.c +++ b/libs/video/targets/vid_wgl.c @@ -40,7 +40,7 @@ #include "QF/keys.h" #include "QF/qargs.h" #include "QF/qendian.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "sbar.h" #include "QF/screen.h" #include "QF/sound.h" diff --git a/nq/include/client.h b/nq/include/client.h index 3b248c304..cf7dca95e 100644 --- a/nq/include/client.h +++ b/nq/include/client.h @@ -35,8 +35,8 @@ #include "QF/info.h" #include "QF/mathlib.h" #include "QF/model.h" -#include "QF/quakefs.h" #include "QF/sound.h" +#include "QF/vfs.h" #include "net.h" #include "protocol.h" diff --git a/nq/include/server.h b/nq/include/server.h index 99c696faf..5df4e36c2 100644 --- a/nq/include/server.h +++ b/nq/include/server.h @@ -39,7 +39,7 @@ #include "sv_progs.h" #include "QF/sizebuf.h" #include "QF/info.h" -#include "QF/quakeio.h" +#include "QF/vfile.h" #include "client.h" extern progs_t sv_pr_state; diff --git a/nq/source/com.c b/nq/source/com.c index 003d90251..bb336f07c 100644 --- a/nq/source/com.c +++ b/nq/source/com.c @@ -30,12 +30,12 @@ # include "config.h" #endif -#include "QF/cvar.h" -#include "QF/quakefs.h" -#include "QF/console.h" -#include "QF/qargs.h" -#include "game.h" #include "QF/cmd.h" +#include "QF/console.h" +#include "QF/cvar.h" +#include "QF/qargs.h" +#include "QF/vfs.h" +#include "game.h" void Cvar_Info (struct cvar_s *var); diff --git a/nq/source/game.c b/nq/source/game.c index 25bdb1a60..8f0271a44 100644 --- a/nq/source/game.c +++ b/nq/source/game.c @@ -32,7 +32,7 @@ # include #endif #include "QF/qargs.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "game.h" qboolean standard_quake = false; diff --git a/nq/source/locs.c b/nq/source/locs.c index 6f7479fc5..d7fb0f004 100644 --- a/nq/source/locs.c +++ b/nq/source/locs.c @@ -41,9 +41,9 @@ #include "QF/compat.h" #include "QF/console.h" #include "QF/locs.h" -#include "QF/quakefs.h" #include "QF/qtypes.h" #include "QF/sys.h" +#include "QF/vfs.h" #include "client.h" diff --git a/nq/source/net_main.c b/nq/source/net_main.c index ec1a891f1..2feecf0ba 100644 --- a/nq/source/net_main.c +++ b/nq/source/net_main.c @@ -37,14 +37,14 @@ #endif #include "QF/cmd.h" +#include "QF/console.h" #include "QF/msg.h" -#include "net.h" -#include "net_vcr.h" #include "QF/qargs.h" #include "QF/sizebuf.h" -#include "QF/console.h" #include "QF/sys.h" -#include "QF/quakeio.h" +#include "QF/vfile.h" +#include "net.h" +#include "net_vcr.h" #include "server.h" qsocket_t *net_activeSockets = NULL; diff --git a/nq/source/pcx.c b/nq/source/pcx.c index d29faa26c..cadc3aaef 100644 --- a/nq/source/pcx.c +++ b/nq/source/pcx.c @@ -40,8 +40,8 @@ #include "QF/pcx.h" #include "QF/qendian.h" #include "QF/qtypes.h" -#include "QF/quakefs.h" #include "QF/texture.h" +#include "QF/vfs.h" #include "QF/vid.h" #include "QF/zone.h" diff --git a/nq/source/skin.c b/nq/source/skin.c index 79e6cdc42..b8d205f1c 100644 --- a/nq/source/skin.c +++ b/nq/source/skin.c @@ -40,10 +40,10 @@ #include "QF/console.h" #include "QF/hash.h" #include "QF/pcx.h" -#include "QF/quakefs.h" #include "QF/skin.h" #include "QF/sys.h" #include "QF/texture.h" +#include "QF/vfs.h" #include "client.h" diff --git a/nq/source/sys_win.c b/nq/source/sys_win.c index 51ab4e209..2d197350b 100644 --- a/nq/source/sys_win.c +++ b/nq/source/sys_win.c @@ -36,13 +36,13 @@ #include "QF/compat.h" #include "QF/qargs.h" -#include "QF/quakeio.h" +#include "QF/screen.h" #include "QF/sys.h" +#include "QF/vfile.h" #include "client.h" #include "game.h" #include "host.h" -#include "QF/screen.h" #define MINIMUM_WIN_MEMORY 0x0880000 #define MAXIMUM_WIN_MEMORY 0x1000000 diff --git a/nq/source/tga.c b/nq/source/tga.c index 683741293..31748f58a 100644 --- a/nq/source/tga.c +++ b/nq/source/tga.c @@ -39,9 +39,9 @@ #include #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sys.h" #include "QF/tga.h" +#include "QF/vfs.h" static int diff --git a/nq/source/wad.c b/nq/source/wad.c index aada72227..0afe74d6c 100644 --- a/nq/source/wad.c +++ b/nq/source/wad.c @@ -31,9 +31,9 @@ #endif #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sys.h" #include "QF/wad.h" +#include "QF/vfs.h" int wad_numlumps; lumpinfo_t *wad_lumps; diff --git a/qw/include/cl_slist.h b/qw/include/cl_slist.h index 365343e1b..504759dfd 100644 --- a/qw/include/cl_slist.h +++ b/qw/include/cl_slist.h @@ -31,7 +31,7 @@ #ifndef _CL_SLIST_H #define _CL_SLIST_H -#include "QF/quakeio.h" +#include "QF/vfile.h" typedef struct server_entry_s { char *server; diff --git a/qw/include/client.h b/qw/include/client.h index add20c754..dd9eff83c 100644 --- a/qw/include/client.h +++ b/qw/include/client.h @@ -30,7 +30,7 @@ #define _CLIENT_H #include "QF/info.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "QF/vid.h" #include "QF/zone.h" diff --git a/qw/include/server.h b/qw/include/server.h index 311b3a64e..a8cd6e7d6 100644 --- a/qw/include/server.h +++ b/qw/include/server.h @@ -39,7 +39,7 @@ #include "QF/progs.h" #include "QF/sizebuf.h" #include "QF/info.h" -#include "QF/quakeio.h" +#include "QF/vfile.h" #define QW_SERVER diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index 46d4b3b29..abcb4ca62 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -47,6 +47,9 @@ #ifdef HAVE_NETINET_IN_H # include #endif +#ifdef HAVE_UNISTD_H +# include +#endif #ifdef HAVE_WINSOCK_H # include @@ -70,7 +73,6 @@ #include "QF/msg.h" #include "QF/plugin.h" #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/qargs.h" #include "QF/screen.h" #include "QF/sound.h" @@ -78,6 +80,7 @@ #include "QF/teamplay.h" #include "QF/vid.h" #include "QF/va.h" +#include "QF/vfs.h" #include "bothdefs.h" #include "buildnum.h" diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index d4cf331c4..f98d8dacb 100644 --- a/qw/source/cl_parse.c +++ b/qw/source/cl_parse.c @@ -51,6 +51,7 @@ #include "QF/sound.h" #include "QF/teamplay.h" #include "QF/va.h" +#include "QF/vfile.h" #include "bothdefs.h" #include "cl_ents.h" diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c index 319920aa7..393108d86 100644 --- a/qw/source/cl_slist.c +++ b/qw/source/cl_slist.c @@ -58,9 +58,9 @@ #include "client.h" #include "QF/cmd.h" #include "QF/console.h" -#include "QF/quakefs.h" #include "QF/sys.h" #include "QF/va.h" +#include "QF/vfile.h" server_entry_t *slist; server_entry_t *all_slist; diff --git a/qw/source/com.c b/qw/source/com.c index 1f55ccb17..7a6d4e416 100644 --- a/qw/source/com.c +++ b/qw/source/com.c @@ -35,8 +35,8 @@ #include "QF/cmd.h" #include "QF/console.h" #include "QF/cvar.h" -#include "QF/quakefs.h" #include "QF/sys.h" +#include "QF/vfs.h" cvar_t *registered; diff --git a/qw/source/game.c b/qw/source/game.c index b04f331aa..22abf8da1 100644 --- a/qw/source/game.c +++ b/qw/source/game.c @@ -43,7 +43,7 @@ #include "QF/cvar.h" #include "QF/info.h" #include "QF/qargs.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "game.h" #include "server.h" diff --git a/qw/source/gl_dyn_part.c b/qw/source/gl_dyn_part.c index b5825de5e..2f83ea58c 100644 --- a/qw/source/gl_dyn_part.c +++ b/qw/source/gl_dyn_part.c @@ -42,10 +42,11 @@ #include "QF/compat.h" #include "QF/console.h" #include "QF/qargs.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "QF/render.h" #include "QF/sys.h" #include "QF/varrays.h" +#include "QF/vfile.h" #include "glquake.h" #include "r_dynamic.h" diff --git a/qw/source/keys.c b/qw/source/keys.c index 876636bf8..6ce638bac 100644 --- a/qw/source/keys.c +++ b/qw/source/keys.c @@ -50,6 +50,7 @@ #include "QF/keys.h" #include "QF/screen.h" #include "QF/sys.h" +#include "QF/vfs.h" /* key up events are sent even if in console mode diff --git a/qw/source/locs.c b/qw/source/locs.c index 6f7479fc5..d7fb0f004 100644 --- a/qw/source/locs.c +++ b/qw/source/locs.c @@ -41,9 +41,9 @@ #include "QF/compat.h" #include "QF/console.h" #include "QF/locs.h" -#include "QF/quakefs.h" #include "QF/qtypes.h" #include "QF/sys.h" +#include "QF/vfs.h" #include "client.h" diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c index 411919de0..cbb690075 100644 --- a/qw/source/net_packetlog.c +++ b/qw/source/net_packetlog.c @@ -44,7 +44,7 @@ #include "QF/msg.h" #include "net.h" #include "protocol.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "server.h" #include "QF/va.h" diff --git a/qw/source/pcx.c b/qw/source/pcx.c index d29faa26c..cadc3aaef 100644 --- a/qw/source/pcx.c +++ b/qw/source/pcx.c @@ -40,8 +40,8 @@ #include "QF/pcx.h" #include "QF/qendian.h" #include "QF/qtypes.h" -#include "QF/quakefs.h" #include "QF/texture.h" +#include "QF/vfs.h" #include "QF/vid.h" #include "QF/zone.h" diff --git a/qw/source/skin.c b/qw/source/skin.c index 24f455e62..3eb287cde 100644 --- a/qw/source/skin.c +++ b/qw/source/skin.c @@ -40,10 +40,10 @@ #include "QF/console.h" #include "QF/hash.h" #include "QF/pcx.h" -#include "QF/quakefs.h" #include "QF/skin.h" #include "QF/sys.h" #include "QF/texture.h" +#include "QF/vfs.h" #include "client.h" diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c index d8744af61..3bc630fb2 100644 --- a/qw/source/sv_ccmds.c +++ b/qw/source/sv_ccmds.c @@ -44,7 +44,7 @@ #include "QF/msg.h" #include "QF/qargs.h" #include "QF/qendian.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "server.h" #include "sv_progs.h" #include "QF/sys.h" diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c index 3792db1a2..80202afcc 100644 --- a/qw/source/sv_init.c +++ b/qw/source/sv_init.c @@ -39,11 +39,11 @@ #include "QF/crc.h" #include "QF/compat.h" #include "QF/msg.h" -#include "QF/quakefs.h" +#include "QF/va.h" +#include "QF/vfs.h" #include "server.h" #include "sv_progs.h" #include "world.h" -#include "QF/va.h" server_t sv; // local server diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c index d15bb384e..fec461327 100644 --- a/qw/source/sv_main.c +++ b/qw/source/sv_main.c @@ -39,24 +39,24 @@ #include #include -#include "bothdefs.h" -#include "buildnum.h" #include "QF/cmd.h" #include "QF/compat.h" -#include "game.h" #include "QF/model.h" -#include "net.h" #include "QF/msg.h" -#include "pmove.h" #include "QF/plugin.h" #include "QF/qargs.h" -#include "QF/quakefs.h" -#include "server.h" -#include "sv_progs.h" #include "QF/sys.h" #include "QF/va.h" #include "QF/ver_check.h" +#include "QF/vfs.h" #include "QF/zone.h" +#include "bothdefs.h" +#include "buildnum.h" +#include "game.h" +#include "net.h" +#include "pmove.h" +#include "server.h" +#include "sv_progs.h" quakeparms_t host_parms; qboolean host_initialized; // true if into command execution diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c index 809dde301..4582ce622 100644 --- a/qw/source/sv_user.c +++ b/qw/source/sv_user.c @@ -41,19 +41,19 @@ #include #include -#include "bothdefs.h" #include "QF/checksum.h" #include "QF/cmd.h" #include "QF/compat.h" #include "QF/cvar.h" #include "QF/msg.h" -#include "msg_ucmd.h" -#include "pmove.h" -#include "QF/quakefs.h" -#include "server.h" -#include "sv_progs.h" #include "QF/sys.h" #include "QF/va.h" +#include "QF/vfs.h" +#include "bothdefs.h" +#include "msg_ucmd.h" +#include "pmove.h" +#include "server.h" +#include "sv_progs.h" #include "world.h" edict_t *sv_player; diff --git a/qw/source/sw_rpart.c b/qw/source/sw_rpart.c index ae458a2d9..3879c8e41 100644 --- a/qw/source/sw_rpart.c +++ b/qw/source/sw_rpart.c @@ -35,7 +35,7 @@ #include "QF/compat.h" #include "QF/console.h" #include "QF/qargs.h" -#include "QF/quakefs.h" +#include "QF/vfs.h" #include "QF/render.h" #include "r_cvar.h" diff --git a/qw/source/tga.c b/qw/source/tga.c index 683741293..31748f58a 100644 --- a/qw/source/tga.c +++ b/qw/source/tga.c @@ -39,9 +39,9 @@ #include #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sys.h" #include "QF/tga.h" +#include "QF/vfs.h" static int diff --git a/qw/source/wad.c b/qw/source/wad.c index cea90edd0..e43a62dd9 100644 --- a/qw/source/wad.c +++ b/qw/source/wad.c @@ -37,9 +37,9 @@ #endif #include "QF/qendian.h" -#include "QF/quakefs.h" #include "QF/sys.h" #include "QF/wad.h" +#include "QF/vfs.h" int wad_numlumps; lumpinfo_t *wad_lumps;