X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=bba4b2383b6a49bc918cf2c33c010159748468a1;hb=69a21479a3466471cecff1eae841893028cb1da7;hp=24025549fa6dec3f1d761cedbf6a095cd4a53d3d;hpb=dab565345260287a1b98d0fc701ee055cbc3d343;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 24025549..bba4b238 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -21,10 +21,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define QUAKE_GAME // as opposed to utilities
 
-#define VERSION 1.50
-
 extern int buildnumber;
 
+#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 FALSE
 #define FALSE 0
 #define TRUE 1
@@ -37,7 +49,7 @@ extern int buildnumber;
 #define ASSERT(condition)
 #endif
 
-#define	GAMENAME	"id1"
+#define GAMENAME "id1"
 
 #include <math.h>
 #include <string.h>
@@ -46,13 +58,6 @@ extern int buildnumber;
 #include <stdlib.h>
 #include <setjmp.h>
 
-#define UNUSED(x)	(x = x)	// for pesky compiler / lint warnings
-
-// LordHavoc: default heap size (unless -heapsize, -mem, or -winmem is used), in megabytes
-#define DEFAULTMEM 24
-//#define	MINIMUM_MEMORY			0x550000
-//#define	MINIMUM_MEMORY_LEVELPAK	(MINIMUM_MEMORY + 0x100000)
-
 #define MAX_NUM_ARGVS	50
 
 // up / down
@@ -181,12 +186,13 @@ extern int buildnumber;
 
 #define	SOUND_CHANNELS		8
 
+#include "zone.h"
+#include "quakeio.h"
 #include "common.h"
 #include "cvar.h"
 #include "bspfile.h"
 #include "vid.h"
 #include "sys.h"
-#include "zone.h"
 #include "mathlib.h"
 
 #include "r_textures.h"
@@ -200,8 +206,8 @@ extern int buildnumber;
 #include "sbar.h"
 #include "sound.h"
 #include "model_shared.h"
-#include "render.h"
 #include "client.h"
+#include "render.h"
 #include "progs.h"
 #include "server.h"
 
@@ -234,8 +240,6 @@ typedef struct
 #endif
 	int		argc;
 	char	**argv;
-	void	*membase;
-	int		memsize;
 } quakeparms_t;