more header fixups. still doesn't compile

include/chase.h

@@ -0,0 +1,38 @@
+/*
+	chase.h
+
+	@description@
+
+	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:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
+*/
+
+#ifndef __chase_h
+#define __chase_h
+
+extern	cvar_t	*chase_active;
+
+void Chase_Init (void);
+void Chase_Reset (void);
+void Chase_Update (void);
+
+#endif __chase_h

include/cmd.h

@@ -130,4 +130,8 @@ void	Cmd_Print (char *text);
 // used by command functions to send output to either the graphics console or
 // passed as a print message to the client
 
+#define		MAX_COM_TOKEN   1024
+extern char		com_token[MAX_COM_TOKEN];
+char *COM_Parse (char *data);
+
 #endif __cmd_h

include/crc.h

@@ -26,7 +26,13 @@
 	$Id$
 */
 
+#ifndef __crc_h
+#define __crc_h
+
+#include "qtypes.h"
 
 void CRC_Init(unsigned short *crcvalue);
 void CRC_ProcessByte(unsigned short *crcvalue, byte data);
 unsigned short CRC_Value(unsigned short crcvalue);
+
+#endif // __crc_h

include/host.h

@@ -0,0 +1,73 @@
+/*
+	host.h
+
+	@description@
+
+	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:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
+*/
+
+#ifndef __host_h
+#define __host_h
+
+#include "qtypes.h"
+#include "cvar.h"
+
+typedef struct
+{
+	char	*basedir;
+	char	*cachedir;		// for development over ISDN lines
+	int		argc;
+	char	**argv;
+	void	*membase;
+	int		memsize;
+} quakeparms_t;
+
+extern	quakeparms_t host_parms;
+
+extern	cvar_t	*sys_ticrate;
+extern	cvar_t	*sys_nostdout;
+extern	cvar_t	*developer;
+
+extern	cvar_t	*pausable;
+
+extern	qboolean	host_initialized;		// true if into command execution
+extern	double		host_frametime;
+extern	byte		*host_basepal;
+extern	byte		*host_colormap;
+extern	int			host_framecount;	// incremented every frame, never reset
+extern	double		realtime;			// not bounded in any way, changed at
+										// start of every frame, never reset
+
+void Host_ClearMemory (void);
+void Host_ServerFrame (void);
+void Host_InitCommands (void);
+void Host_Init (quakeparms_t *parms);
+void Host_Shutdown(void);
+void Host_Error (char *error, ...);
+void Host_EndGame (char *message, ...);
+void Host_Frame (float time);
+void Host_Quit_f (void);
+void Host_ClientCommands (char *fmt, ...);
+void Host_ShutdownServer (qboolean crash);
+
+#endif // __host_h

include/keys.h

@@ -26,6 +26,10 @@
 	$Id$
 */
 
+#ifndef __keys_h
+#define __keys_h
+
+#include "qtypes.h"
 
 //
 // these are the key numbers that should be passed to Key_Event
@@ -140,3 +144,4 @@ void Key_WriteBindings (FILE *f);
 void Key_SetBinding (int keynum, char *binding);
 void Key_ClearStates (void);
 
+#endif // __keys_h

include/mathlib.h

@@ -48,6 +48,13 @@ extern	int nanmask;
 #define VectorAdd(a,b,c) {c[0]=a[0]+b[0];c[1]=a[1]+b[1];c[2]=a[2]+b[2];}
 #define VectorCopy(a,b) {b[0]=a[0];b[1]=a[1];b[2]=a[2];}
 
+// up / down
+#define PITCH	0
+// left / right
+#define YAW		1
+// fall over
+#define ROLL	2
+
 void VectorMA (vec3_t veca, float scale, vec3_t vecb, vec3_t vecc);
 
 vec_t _DotProduct (vec3_t v1, vec3_t v2);

include/qdefs.h

@@ -39,6 +39,7 @@
 #define NUM_CSHIFTS		4
 #define MAX_MODELS		256
 #define MAX_SOUNDS		256
+#define	MAX_SCOREBOARD		16
 #define	MAX_SCOREBOARDNAME	32
 #define MAX_STYLESTRING	64
 #define	MAX_EDICTS		600			// FIXME: ouch! ouch! ouch!

include/screen.h

@@ -26,6 +26,11 @@
 	$Id$
 */
 
+#ifndef __screen_h
+#define __screen_h
+
+#include "qtypes.h"
+#include "cvar.h"
 
 void SCR_Init (void);
 void SCR_InitCvars (void);
@@ -64,3 +69,5 @@ extern	int			scr_copyeverything;
 extern qboolean		block_drawing;
 
 void SCR_UpdateWholeScreen (void);
+
+#endif // __screen_h

include/server.h

@@ -32,7 +32,6 @@
 #include <setjmp.h>
 
 #include "gcc_attr.h"
-#include "commdef.h"
 #include "net.h"
 #include "cvar.h"
 #include "protocol.h"

include/va.h

@@ -1,5 +1,5 @@
 /*
-	commdef.h
+	va.h
 
 	Definitions common to client and server.
 
@@ -27,43 +27,16 @@
 	$Id$
 */
 
-#ifndef _COMMDEF_H
-#define _COMMDEF_H
+#ifndef __va_h
+#define __va_h
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include "cvar.h"
 #include "gcc_attr.h"
 
-/* The host system specifies the base of the directory tree, the
-   command line parms passed to the program, and the amount of memory
-   available for the program to use.
-*/
-
-typedef struct
-{
-	char	*basedir;
-	char	*cachedir;		// for development over ISDN lines
-	int		argc;
-	char	**argv;
-	void	*membase;
-	int		memsize;
-} quakeparms_t;
-
-/* Host */
-extern	quakeparms_t host_parms;
-
-extern	cvar_t		*sys_nostdout;
-extern	cvar_t		*developer;
-
-extern	qboolean	host_initialized;	/* True if into command execution. */
-//extern	double		host_frametime;
-extern	double		realtime;			/* Not bounded in any way, changed at
-										   start of every frame, never reset */
-
 char	*va(char *format, ...) __attribute__((format(printf,1,2)));
 // does a varargs printf into a temp buffer
 
-#endif // _COMMDEF_H
+#endif // __va_h

include/world.h

@@ -26,6 +26,11 @@
 	$Id$
 */
 
+#ifndef __world_h
+#define __world_h
+
+#include "qtypes.h"
+#include "progs.h"
 
 typedef struct
 {
@@ -84,3 +89,5 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
 // shouldn't be considered solid objects
 
 // passedict is explicitly excluded from clipping checks (normally NULL)
+
+#endif // __world_h

source/cd_audio.c

@@ -31,7 +31,6 @@
 #endif
 
 #include <dpmi.h>
-#include "quakedef.h"
 #include "dosisms.h"
 
 #define ADDRESS_MODE_HSG		0

source/cd_null.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 void CDAudio_Play(byte track, qboolean looping)
 {

source/cd_win.c

@@ -31,7 +31,6 @@
 #endif
 
 #include <windows.h>
-#include "quakedef.h"
 
 extern	HWND	mainwindow;
 

source/cl_cam.c

@@ -30,7 +30,9 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
+#include "mathlib.h"
+#include "client.h"
+#include "world.h"
 
 qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace);
 

source/cl_demo.c

@@ -30,7 +30,15 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
+#include <string.h>
+
+#include "qendian.h"
+#include "va.h"
+#include "host.h"
+#include "msg.h"
+#include "client.h"
+#include "sys.h"
+#include "console.h"
 
 void CL_FinishTimeDemo (void);
 

source/cl_input.c

@@ -30,7 +30,12 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
+#include <string.h>
+
+#include "msg.h"
+#include "host.h"
+#include "console.h"
+#include "client.h"
 
 /*
 ===============================================================================
@@ -164,7 +169,7 @@ void IN_UseUp (void) {KeyUp(&in_use);}
 void IN_JumpDown (void) {KeyDown(&in_jump);}
 void IN_JumpUp (void) {KeyUp(&in_jump);}
 
-void IN_Impulse (void) {in_impulse=Q_atoi(Cmd_Argv(1));}
+void IN_Impulse (void) {in_impulse=atoi(Cmd_Argv(1));}
 
 /*
 ===============
@@ -299,7 +304,7 @@ void CL_BaseMove (usercmd_t *cmd)
 			
 	CL_AdjustAngles ();
 	
-	Q_memset (cmd, 0, sizeof(*cmd));
+	memset (cmd, 0, sizeof(*cmd));
 	
 	if (in_strafe.state & 1)
 	{

source/cl_main.c

@@ -30,7 +30,17 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
+#include "msg.h"
+#include "cvar.h"
+#include "client.h"
+#include "chase.h"
+#include "input.h"
+#include "host.h"
+#include "va.h"
+#include "host.h"
+#include "server.h"
+#include "console.h"
+#include "screen.h"
 
 // we need to declare some mouse variables here, because the menu system
 // references them even when on a unix system.

source/cl_parse.c

@@ -30,7 +30,17 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
+#include <string.h>
+
+#include "client.h"
+#include "host.h"
+#include "msg.h"
+#include "console.h"
+#include "cdaudio.h"
+#include "sys.h"
+#include "sbar.h"
+#include "screen.h"
+#include "server.h"
 
 char *svc_strings[] =
 {
@@ -833,8 +843,8 @@ void CL_ParseServerMessage (void)
 			i = MSG_ReadByte ();
 			if (i >= MAX_LIGHTSTYLES)
 				Sys_Error ("svc_lightstyle > MAX_LIGHTSTYLES");
-			Q_strcpy (cl_lightstyle[i].map,  MSG_ReadString());
-			cl_lightstyle[i].length = Q_strlen(cl_lightstyle[i].map);
+			strcpy (cl_lightstyle[i].map,  MSG_ReadString());
+			cl_lightstyle[i].length = strlen(cl_lightstyle[i].map);
 			break;
 			
 		case svc_sound:

source/cl_tent.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 int			num_temp_entities;
 entity_t	cl_temp_entities[MAX_TEMP_ENTITIES];

source/cmd.c

@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "cmd.h"
+#include "host.h"
 #include "client.h"
 #include "msg.h"
 #include "quakefs.h"

source/common.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 #define NUM_SAFE_ARGVS  7
 

source/conproc.c

@@ -32,7 +32,6 @@
 
 #include <windows.h>
 #include "conproc.h"
-#include "quakedef.h"
 
 HANDLE	heventDone;
 HANDLE	hfileBuffer;

source/console.c

@@ -37,7 +37,6 @@
 #include <unistd.h>
 #endif
 #include <fcntl.h>
-#include "quakedef.h"
 
 int 		con_linewidth;
 

source/crc.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "crc.h"
 
 // this is a 16 bit, non-reflected CRC using the polynomial 0x1021

source/cvar.c

@@ -33,11 +33,9 @@
 # include <config.h>
 #endif
 
-//#include "commdef.h"
-#include "quakedef.h"
 #include "cvar.h"
 #include "console.h"
-//#include "qargs.h"
+#include "server.h"
 #include "cmd.h"
 
 #include <stdio.h>

source/d_edge.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "d_local.h"
 
 static int	miplevel;

source/d_fill.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 
 /*

source/d_init.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "d_local.h"
 
 #define NUM_MIPS	4

source/d_modech.c

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

source/d_part.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "d_local.h"
 
 

source/d_polyse.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/d_scan.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/d_sky.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/d_sprite.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "d_local.h"
 
 static int		sprite_height;

source/d_surf.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "d_local.h"
 #include "r_local.h"
 

source/d_vars.c

@@ -32,7 +32,6 @@
 
 #ifndef	USE_INTEL_ASM
 
-#include	"quakedef.h"
 
 // all global and static refresh variables are collected in a contiguous block
 // to avoid cache conflicts.

source/d_zpoint.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "d_local.h"
 
 

source/dga_check.c

@@ -32,7 +32,6 @@
 # include "config.h"
 #endif
 
-#include <quakedef.h>
 
 #include <stdlib.h>
 #include <X11/Xlib.h>

source/draw.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 typedef struct {
 	vrect_t	rect;

source/gl_draw.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 #define GL_COLOR_INDEX8_EXT     0x80E5
 

source/gl_mesh.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 /*
 =================================================================

source/gl_model.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 model_t	*loadmodel;
 char	loadname[32];	// for hunk tags

source/gl_refrag.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 mnode_t	*r_pefragtopnode;
 

source/gl_rlight.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 int	r_dlightframecount;
 

source/gl_rmain.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 entity_t	r_worldentity;
 

source/gl_rmisc.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 
 

source/gl_rsurf.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 int			skytexturenum;
 

source/gl_screen.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 /*
 

source/gl_test.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 #ifdef GLTEST
 

source/gl_vidlinux.c

@@ -45,7 +45,6 @@
 #include "vgakeyboard.h"
 #include "vgamouse.h"
 
-#include "quakedef.h"
 #include "GL/fxmesa.h"
 
 #define WARP_WIDTH              320

source/gl_vidlinuxglx.c

@@ -40,7 +40,6 @@
 
 #include <dlfcn.h>
 
-#include "quakedef.h"
 
 #include <GL/glx.h>
 

source/gl_vidnt.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "winquake.h"
 #include "resource.h"
 #include <commctrl.h>

source/gl_warp.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 extern	model_t	*loadmodel;
 

source/host.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 /*

source/host_cmd.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 int	current_skill;
 

source/in_dos.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "dosisms.h"
 
 #define AUX_FLAG_FREELOOK	0x00000001

source/in_null.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 void IN_Init (void)
 {

source/in_sun.c

@@ -44,7 +44,6 @@
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
-#include "quakedef.h"
 
 
 //

source/in_win.c

@@ -31,7 +31,6 @@
 #endif
 
 #include <dinput.h>
-#include "quakedef.h"
 #include "winquake.h"
 #include "dosisms.h"
 

source/keys.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 /*
 

source/mathlib.c

@@ -31,9 +31,9 @@
 #endif
 
 #include <math.h>
-#include "quakedef.h"
 
-void Sys_Error (char *error, ...);
+#include "mathlib.h"
+#include "sys.h"
 
 vec3_t vec3_origin = {0,0,0};
 int nanmask = 255<<23;

source/menu.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 #ifdef _WIN32
 #include "winquake.h"

source/model.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 model_t	*loadmodel;

source/net_bsd.c

@@ -30,8 +30,7 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
-
+#include "net.h"
 #include "net_loop.h"
 #include "net_dgrm.h"
 

source/net_bw.c

@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <dpmi.h>
 
-#include "quakedef.h"
 #include "dosisms.h"
 
 

source/net_dgrm.c

@@ -30,9 +30,19 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
+#include "sys.h"
+#include "keys.h"
+#include "client.h"
+#include "server.h"
 #include "qendian.h"
 #include "msg.h"
 #include "qargs.h"
+#include "screen.h"
+#include "console.h"
+#include "net.h"
+#include "qdefs.h"
 
 // This is enables a simple IP banning mechanism
 #define BAN_TEST
@@ -67,7 +77,6 @@ unsigned long inet_addr(const char *cp);
 #endif
 #endif	// BAN_TEST
 
-#include "quakedef.h"
 #include "net_dgrm.h"
 
 // these two macros are to make the code more readable

source/net_dos.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 #include "net_loop.h"
 #include "net_dgrm.h"

source/net_ipx.c

@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <dpmi.h>
 
-#include "quakedef.h"
 #include "dosisms.h"
 #include "net_ipx.h"
 

source/net_loop.c

@@ -30,8 +30,12 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
+#include "net.h"
 #include "net_loop.h"
+#include "client.h"
+#include "console.h"
+#include "sys.h"
+#include "server.h"
 
 qboolean	localconnectpending = false;
 qsocket_t	*loop_client = NULL;

source/net_main.c

@@ -30,10 +30,15 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
+#include <string.h>
+
+#include "net.h"
 #include "net_vcr.h"
 #include "qargs.h"
 #include "sizebuf.h"
+#include "console.h"
+#include "sys.h"
+#include "server.h"
 
 qsocket_t	*net_activeSockets = NULL;
 qsocket_t	*net_freeSockets = NULL;

source/net_mp.c

@@ -31,7 +31,6 @@
 #endif
 
 #include <dpmi.h>
-#include "quakedef.h"
 #include "mpdosock.h"
 
 short flat_selector;

source/net_none.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 #include "net_loop.h"
 

source/net_ser.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "net_ser.h"
 #include "dosisms.h"
 #include "crc.h"

source/net_vcr.c

@@ -30,9 +30,10 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
+#include "net.h"
 #include "net_vcr.h"
-
+#include "sys.h"
+#include "server.h"
 extern int vcrFile;
 
 // This is the playback portion of the VCR.  It reads the file produced

source/net_win.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 #include "net_loop.h"
 #include "net_dgrm.h"

source/net_wins.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "winquake.h"
 
 #define MAXHOSTNAMELEN		256

source/net_wipx.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "winquake.h"
 #include <wsipx.h>
 #include "net_wipx.h"

source/nonintel.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/pr_cmds.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 #define	RETURN_EDICT(e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(e))
 

source/pr_edict.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 dprograms_t		*progs;
 dfunction_t		*pr_functions;

source/pr_exec.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 
 /*

source/r_aclip.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/r_alias.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"	// FIXME: shouldn't be needed (is needed for patch
 						// right now, but that should move)

source/r_bsp.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 //

source/r_draw.c

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

source/r_edge.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 #if 0

source/r_efrag.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 mnode_t	*r_pefragtopnode;

source/r_light.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 int	r_dlightframecount;

source/r_main.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 //define	PASSAGES

source/r_misc.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 

source/r_part.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 #define MAX_PARTICLES			2048	// default max # of particles at one

source/r_sky.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 

source/r_sprite.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 static int				clip_current;

source/r_surf.c

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

source/r_vars.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include	"quakedef.h"
 
 #ifndef	USE_INTEL_ASM
 

source/sbar.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 
 
 int			sb_updates;		// if >= vid.numpages, no update needed

source/screen.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "r_local.h"
 
 // only the refresh window will be updated unless these variables are flagged 

source/snd_dma.c

@@ -39,7 +39,7 @@
 #include "console.h"
 #include "client.h"
 #include "qargs.h"
-#include "quakedef.h"
+#include "host.h"
 
 #ifdef _WIN32
 #include "winquake.h"

source/snd_dos.c

@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include "quakedef.h"
 #include "dosisms.h"
 
 int BLASTER_GetDMAPos(void);