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 0232c8f39e716b8d128cd9ecad9d9b68e93ebfef..8209817ab8916757645110185dbbbb76b731edfc 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -8,7 +8,7 @@ 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.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,10 +19,30 @@ 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
+#ifndef QUAKEDEF_H
+#define QUAKEDEF_H
 
-#define        VERSION                         1.50
-extern int buildnumber;
+#define QUAKE_GAME // as opposed to utilities
+
+#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
@@ -36,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 (win32 only) or -mem 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
 
@@ -180,60 +186,45 @@ 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"
 
-// LordHavoc: made this more compact, and added some more fields
-typedef struct
-{
-       vec3_t  origin;
-       vec3_t  angles;
-       int             effects;
-       short   modelindex;
-       short   frame;
-       byte    colormap;
-       byte    skin;
-       byte    alpha;
-       byte    scale;
-       byte    glowsize;
-       byte    glowcolor;
-       byte    colormod;
-} entity_state_t;
-
-
 #include "r_textures.h"
 
 #include "wad.h"
 #include "draw.h"
-#include "cvar.h"
 #include "screen.h"
 #include "net.h"
 #include "protocol.h"
 #include "cmd.h"
 #include "sbar.h"
 #include "sound.h"
-#include "render.h"
+#include "model_shared.h"
 #include "client.h"
+#include "render.h"
 #include "progs.h"
 #include "server.h"
 
-#include "model_shared.h"
-
 #include "input.h"
 #include "world.h"
 #include "keys.h"
 #include "console.h"
-#include "view.h"
 #include "menu.h"
 #include "crc.h"
 #include "cdaudio.h"
 
 #include "glquake.h"
 
+#include "ui.h"
+
+#include "portals.h"
+
 //=============================================================================
 
 // the host system specifies the base of the directory tree, the
@@ -243,11 +234,11 @@ typedef struct
 typedef struct
 {
        char    *basedir;
+#if CACHEENABLE
        char    *cachedir;              // for development over ISDN lines
+#endif
        int             argc;
        char    **argv;
-       void    *membase;
-       int             memsize;
 } quakeparms_t;
 
 
@@ -264,7 +255,6 @@ extern qboolean noclip_anglehack;
 extern quakeparms_t host_parms;
 
 extern cvar_t          sys_ticrate;
-extern cvar_t          sys_nostdout;
 extern cvar_t          developer;
 
 extern qboolean        host_initialized;               // true if into command execution
@@ -277,7 +267,7 @@ extern      double          realtime;                       // not bounded in any way, changed at
 void Host_ClearMemory (void);
 void Host_ServerFrame (void);
 void Host_InitCommands (void);
-void Host_Init ();
+void Host_Init (void);
 void Host_Shutdown(void);
 void Host_Error (char *error, ...);
 void Host_EndGame (char *message, ...);
@@ -292,8 +282,6 @@ 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)
 
-extern qboolean                isDedicated;
-
 extern int                     minimum_memory;
 
 //
@@ -306,6 +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
+