DP code cleanup, stage one - all headers that can be protected by ifdef

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index f9fbe204e860afb2fcee50b6f5d5e61bb1d27c0d..8209817ab8916757645110185dbbbb76b731edfc 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -19,9 +19,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // quakedef.h -- primary header for client
 
+#ifndef QUAKEDEF_H
+#define QUAKEDEF_H
+
 #define QUAKE_GAME // as opposed to utilities
 
-extern int buildnumber;
+#include <math.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <setjmp.h>
+
+extern char *buildstring;
+
+typedef unsigned char qbyte;
+
+#undef true
+#undef false
+
+typedef enum {false, true} qboolean;
+
+#ifndef NULL
+#define NULL ((void *)0)
+#endif
 
 #ifndef FALSE
 #define FALSE 0
@@ -35,21 +56,7 @@ extern int buildnumber;
 #define ASSERT(condition)
 #endif
 
-#define        GAMENAME        "id1"
-
-#include <math.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#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 GAMENAME "id1"
 
 #define MAX_NUM_ARGVS  50
 
@@ -179,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"
@@ -198,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"
 
@@ -207,7 +215,6 @@ extern int buildnumber;
 #include "world.h"
 #include "keys.h"
 #include "console.h"
-#include "view.h"
 #include "menu.h"
 #include "crc.h"
 #include "cdaudio.h"
@@ -232,8 +239,6 @@ typedef struct
 #endif
        int             argc;
        char    **argv;
-       void    *membase;
-       int             memsize;
 } quakeparms_t;
 
 
@@ -289,8 +294,12 @@ void Chase_Reset (void);
 void Chase_Update (void);
 
 void fractalnoise(unsigned char *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
+