X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=ae27cfeea56427438835271f33026a983ad63823;hb=a3a9a6454a1d1450eef77e7d0411a196805f2673;hp=85760abad582bb32b6c2029c71990b0c9bba651e;hpb=ff5947f97081e10c4ce112d4d51c2d1fa14ebba8;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 85760aba..ae27cfee 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -19,37 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // quakedef.h -- primary header for client
 
-#define QUAKE_GAME // as opposed to utilities
-
-extern char *buildstring;
-
-#if !defined BYTE_DEFINED
-typedef unsigned char 		byte;
-#define BYTE_DEFINED 1
-#endif
-
-#undef true
-#undef false
-
-typedef enum {false, true} qboolean;
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
+#ifndef QUAKEDEF_H
+#define QUAKEDEF_H
 
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
-//define	PARANOID			// speed sapping error checking
-#ifdef _DEBUG
-#define ASSERT(condition) if (!(condition)) Sys_Error("assertion (##condition) failed at " __FILE__ ":" __LINE__ "\n");
-#else
-#define ASSERT(condition)
-#endif
-
-#define GAMENAME "id1"
+#define QUAKE_GAME // as opposed to utilities
 
 #include <math.h>
 #include <string.h>
@@ -58,16 +31,13 @@ typedef enum {false, true} qboolean;
 #include <stdlib.h>
 #include <setjmp.h>
 
-#define MAX_NUM_ARGVS	50
+#include "qtypes.h"
 
-// up / down
-#define	PITCH	0
+extern char *buildstring;
 
-// left / right
-#define	YAW		1
+#define GAMENAME "id1"
 
-// fall over
-#define	ROLL	2
+#define MAX_NUM_ARGVS	50
 
 
 #define	MAX_QPATH		128			// max length of a quake game pathname
@@ -191,8 +161,8 @@ typedef enum {false, true} qboolean;
 #include "common.h"
 #include "cvar.h"
 #include "bspfile.h"
-#include "vid.h"
 #include "sys.h"
+#include "vid.h"
 #include "mathlib.h"
 
 #include "r_textures.h"
@@ -225,78 +195,56 @@ typedef enum {false, true} qboolean;
 
 #include "portals.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;
-#if CACHEENABLE
-	char	*cachedir;		// for development over ISDN lines
-#endif
-	int		argc;
-	char	**argv;
-} quakeparms_t;
-
-
-//=============================================================================
-
-
-
 extern qboolean noclip_anglehack;
 
-
 //
 // host
 //
-extern	quakeparms_t host_parms;
-
-extern	cvar_t		sys_ticrate;
-extern	cvar_t		developer;
-
-extern	qboolean	host_initialized;		// true if into command execution
-extern	double		host_frametime;
-extern	double		host_realframetime;	// LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling)
-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
+extern cvar_t sys_ticrate;
+extern cvar_t developer;
+
+// true if into command execution
+extern qboolean host_initialized;
+extern double host_frametime;
+// LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling)
+extern double host_realframetime;
+// incremented every frame, never reset
+extern int host_framecount;
+// not bounded in any way, changed at start of every frame, never reset
+extern double realtime;
 
 void Host_ClearMemory (void);
 void Host_ServerFrame (void);
 void Host_InitCommands (void);
 void Host_Init (void);
 void Host_Shutdown(void);
-void Host_Error (char *error, ...);
-void Host_EndGame (char *message, ...);
+void Host_Error (const char *error, ...);
+void Host_EndGame (const char *message, ...);
 void Host_Frame (float time);
 void Host_Quit_f (void);
-void Host_ClientCommands (char *fmt, ...);
+void Host_ClientCommands (const char *fmt, ...);
 void Host_ShutdownServer (qboolean crash);
 
-extern qboolean		msg_suppress_1;		// suppresses resolution and cache size console output
-										//  an fullscreen DIB focus gain/loss
-extern int			current_skill;		// skill level for currently loaded level (in case
-										//  the user changes the cvar while the level is
-										//  running, this reflects the level actually in use)
+// skill level for currently loaded level (in case the user changes the cvar while the level is running, this reflects the level actually in use)
+extern int current_skill;
 
-extern int			minimum_memory;
+extern int minimum_memory;
 
 //
 // chase
 //
-extern	cvar_t	chase_active;
+extern cvar_t chase_active;
 
 void Chase_Init (void);
 void Chase_Reset (void);
 void Chase_Update (void);
 
 void fractalnoise(unsigned char *noise, int size, int startgrid);
-void fractalnoisequick(byte *noise, int size, int startgrid);
+void fractalnoisequick(unsigned char *noise, int size, int startgrid);
 
 #include "palette.h"
-#include "image.h"
 
 void Sys_Shared_Init(void);
+
+#endif
+