rename quakedef.h to host.h (I should have done this months ago).

NOTE: -{sdl,sgl,3dfx,ggi,wgl,mgl} targets are very likely to be broken
if any file fails to compile, just put #include "host.h" into it

include/context_x11.h

@@ -31,10 +31,12 @@
 #ifndef __CONTEXT_X11_H__
 #define __CONTEXT_X11_H__
 
-#include <qtypes.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "cvar.h"
+#include "qtypes.h"
+
 void GetEvent( void );
 
 extern Display	*x_disp;

include/dga_check.h

@@ -32,6 +32,8 @@
 
 #include <X11/Xlib.h>
 
+#include "qtypes.h"
+
 /*
   VID_CheckDGA
 

source/cd_audio.c

@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 #include <dpmi.h>
-#include "quakedef.h"
 #include "dosisms.h"
 
 extern cvar_t	*bgmvolume;

source/cd_null.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 
 void CDAudio_Play(byte track, qboolean looping)
 {

source/cd_sdl.c

@@ -37,7 +37,6 @@
 # include <config.h>
 #endif
 #include <windows.h>
-#include "quakedef.h"
 #include "qargs.h"
 #include "console.h"
 #include "cdaudio.h"

source/cd_win.c

@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 #include <windows.h>
-#include "quakedef.h"
 #include "qargs.h"
 #include "console.h"
 #include "cdaudio.h"

source/cl_demo.c

@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "cvar.h"
 #include "sizebuf.h"
@@ -40,7 +42,6 @@
 #include "qendian.h"
 #include "va.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "pmove.h"
 #include "cl_main.h"
 

source/cl_ents.c

@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "sys.h"
 #include "cvar.h"
@@ -40,7 +42,6 @@
 #include "console.h"
 #include "qendian.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "pmove.h"
 #include "view.h"
 #include "teamplay.h"

source/cl_input.c

@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "input.h"
 #include "sys.h"
 #include "sys.h"
@@ -41,7 +43,6 @@
 #include "console.h"
 #include "qendian.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "pmove.h"
 #include "view.h"
 #include "checksum.h"

source/cl_main.c

@@ -30,6 +30,8 @@
 # include "config.h"
 #endif
 #include <ctype.h>
+
+#include "host.h"
 #include "bothdefs.h"
 #include "input.h"
 #include "in_win.h"
@@ -45,7 +47,6 @@
 #include "console.h"
 #include "qendian.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "pmove.h"
 #include "view.h"
 #include "checksum.h"

source/cl_misc.c

@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
-#include "quakedef.h"
 
 qboolean ServerPaused (void)
 {

source/cl_parse.c

@@ -29,12 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "client.h"
 #include "cmd.h"
 #include "screen.h"
 #include "cdaudio.h"
-#include "quakedef.h"
 #include "bothdefs.h"
 #include "console.h"
 #include "msg.h"

source/cl_sys_sdl.c

@@ -58,7 +58,6 @@
 
 #include "sys.h"
 #include "qargs.h"
-#include "quakedef.h"
 #include "qargs.h"
 #include "client.h"
 

source/cl_sys_unix.c

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

source/cl_sys_win.c

@@ -36,7 +36,6 @@
 #include <io.h>
 #include <conio.h>
 
-#include "quakedef.h"
 #include "winquake.h"
 #include "resource.h"
 #include "sys.h"

source/cl_tent.c

@@ -29,7 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"	// Host_EndGame
+
+#include "host.h"
 #include "sys.h"
 #include "ctype.h"
 #include "render.h"

source/cl_trans.c

@@ -29,16 +29,17 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"   // Host_EndGame
-#include "sys.h"
-#include "vid.h"
-#include "client.h"
 
 #include <string.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 
+#include "host.h"
+#include "sys.h"
+#include "vid.h"
+#include "client.h"
+
 /*
 =====================
 CL_NewTranslation

source/d_edge.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 static int	miplevel;

source/d_modech.c

@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 #include "sys.h"
-#include "quakedef.h"
 #include "d_local.h"
 
 int	d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle;

source/d_part.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 

source/d_polyse.c

@@ -30,7 +30,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 #include "bothdefs.h"

source/d_scan.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/d_sky.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/d_sprite.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 static int		sprite_height;

source/d_vars.c

@@ -31,7 +31,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include	"quakedef.h"
+
+#include "host.h"
 
 // all global and static refresh variables are collected in a contiguous block
 // to avoid cache conflicts.

source/d_zpoint.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 

source/dga_check.c

@@ -28,7 +28,9 @@
 	$Id$
 */
 
-#include <quakedef.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <X11/Xlib.h>

source/gl_dyn_part.c

@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "glquake.h"
-#include "quakedef.h"
 #include "cmd.h"
 #include "qargs.h"
 #include "console.h"

source/gl_refrag.c

@@ -53,7 +53,6 @@
 #include "console.h"
 #include "glquake.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "cl_main.h"
 
 mnode_t	*r_pefragtopnode;

source/gl_trans.c

@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
-#include "quakedef.h"
 #include "protocol.h"
 #include "glquake.h"
 

source/in_null.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 
 void IN_Init (void)
 {

source/in_sdl.c

@@ -44,7 +44,6 @@
 #include "sys.h"
 #include "qargs.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "vid.h"
 #include "view.h"
 

source/in_svgalib.c

@@ -29,6 +29,7 @@
 	$Id$
 */
 
+#include "host.h"
 #include "client.h"
 #include "cl_input.h"
 #include "cmd.h"
@@ -39,7 +40,6 @@
 #include "keys.h"
 #include "qargs.h"
 #include "qtypes.h"
-#include "quakedef.h"
 #include "sys.h"
 #include "view.h"
 

source/in_win.c

@@ -34,7 +34,6 @@
 #ifdef __MINGW32__
 # define INITGUID
 #endif
-#include "quakedef.h"
 #include "winquake.h"
 #include <dinput.h>
 #include "client.h"

source/in_x11.c

@@ -55,9 +55,9 @@
 #include <X11/extensions/xf86dga.h>
 #endif
 
-#include "quakedef.h"
 #include "dga_check.h"
 #include "d_local.h"
+#include "host.h"
 #include "sound.h"
 #include "keys.h"
 #include "cvar.h"

source/menu.c

@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
-#include "quakedef.h"
 #ifdef _WIN32
 #include "winquake.h"
 #endif

source/nonintel.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 
 #ifndef USE_INTEL_ASM
 

source/r_aclip.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/r_draw.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"	// FIXME: shouldn't need to include this
 

source/r_light.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 
 int	r_dlightframecount;

source/r_misc.c

@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "console.h"
 #include "cmd.h"
@@ -36,7 +38,6 @@
 #include "r_local.h"
 #include "draw.h"
 #include "menu.h"
-#include "quakedef.h"
 #include "cl_parse.h"
 
 qboolean	allowskybox;	// whether or not to allow skyboxes  --KB

source/r_part.c

@@ -29,11 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "qargs.h"
 #include "r_local.h"
 #include "console.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "r_dynamic.h"
 
 #include <stdlib.h>

source/r_sky.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/r_surf.c

@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 #include "sys.h"
-#include "quakedef.h"
 #include "r_local.h"
 
 drawsurf_t	r_drawsurf;

source/r_vars.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include	"quakedef.h"
 
 #ifndef USE_INTEL_ASM
 

source/r_view.c

@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "host.h"
 #include "view.h"
 #include "bothdefs.h"
 #include "screen.h"
@@ -40,7 +41,6 @@
 #include "r_local.h"
 #include "msg.h"
 #include "commdef.h"
-#include "quakedef.h"
 
 /*
 

source/screen.c

@@ -38,11 +38,11 @@
 #include "console.h"
 #include "d_iface.h"
 #include "draw.h"
+#include "host.h"
 #include "keys.h"
 #include "menu.h"
 #include "pcx.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "sbar.h"
 #include "skin.h"
 #include "sys.h"

source/snd_dma.c

@@ -29,13 +29,14 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "sound.h"
 #include "cmd.h"
 #include "console.h"
 #include "client.h"
 #include "qargs.h"
-#include "quakedef.h"
 
 // fixme: Damn crappy complier doesn't allow me to UNDEF _win32 on command line!
 #ifdef WIN32SDL

source/snd_win.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "winquake.h"
 #include "qargs.h"
 #include "console.h"

source/sw_view.c

@@ -29,7 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
+
+#include "host.h"
 #include "r_local.h"
 
 extern byte 	gammatable[256];

source/sys_null.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "errno.h"
 
 

source/sys_unix.c

@@ -30,10 +30,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "sys.h"
-#include "qargs.h"
-#include "cvar.h"
-#include "server.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,7 +39,10 @@
 #include <sys/time.h>
 
 #include "sys.h"
-#include "quakedef.h"
+#include "qargs.h"
+#include "host.h"
+#include "cvar.h"
+#include "server.h"
 
 /* This is unused in the client, but we need the symbol there too. */
 server_static_t	svs;

source/vid_3dfxsvga.c

@@ -56,7 +56,6 @@
 #include "glquake.h"
 #include "qargs.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "quakefs.h"
 #include "sbar.h"
 #include "sys.h"

source/vid_ggi.c

@@ -41,8 +41,6 @@
 
 #include "bothdefs.h"   // needed by: common.h, net.h, client.h
 
-#include "quakedef.h"
-
 #include "bspfile.h"    // needed by: glquake.h
 #include "vid.h"
 #include "sys.h"

source/vid_glx.c

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

source/vid_mgl.c

@@ -31,7 +31,6 @@
 #endif
 #include <stdlib.h>
 
-#include "quakedef.h"
 #include "va.h"
 #include "winquake.h"
 #include "sys.h"

source/vid_null.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 viddef_t	vid;				// global video state

source/vid_sdl.c

@@ -38,7 +38,6 @@
 #include "cvar.h"
 #include "d_local.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "sys.h"
 #include "va.h"
 #include "vid.h"

source/vid_sgl.c

@@ -40,7 +40,6 @@
 #include "console.h"
 #include "qargs.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "sys.h"
 #include "va.h"
 #include "glquake.h"

source/vid_svgalib.c

@@ -34,7 +34,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
+
+#include "host.h"
 #include "d_local.h"
 #include "cvar.h"
 #include "cmd.h"

source/vid_wgl.c

@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "quakedef.h"
 #include "va.h"
 #include "winquake.h"
 #include "sys.h"

source/vid_x11.c

@@ -69,13 +69,13 @@
 #include "d_local.h"
 #include "dga_check.h"
 #include "draw.h"
+#include "host.h"
 #include "input.h"
 #include "input.h"
 #include "keys.h"
 #include "menu.h"
 #include "qargs.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "sys.h"
 #include "va.h"