now checks that a lightmap surfacechain is not NULL before dereferencing it

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 5165ef93c00fd32131afed6604d0c519b5291d35..2f8866df39e21252817fe15dc2f2800f4e2318ee 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef QUAKEDEF_H
 #define QUAKEDEF_H
 
-#define QUAKE_GAME // as opposed to utilities
 
+#include <sys/types.h>
 #include <math.h>
 #include <string.h>
 #include <stdarg.h>
@@ -177,8 +177,6 @@ extern char *buildstring;
 // LordHavoc: increased name limit from 32 to 64 characters
 #define        MAX_SCOREBOARDNAME      64
 
-#define        SOUND_CHANNELS          8
-
 #include "zone.h"
 #include "fs.h"
 #include "common.h"
@@ -190,7 +188,6 @@ extern char *buildstring;
 
 #include "r_textures.h"
 
-#include "wad.h"
 #include "draw.h"
 #include "screen.h"
 #include "netconn.h"
@@ -202,7 +199,6 @@ extern char *buildstring;
 #include "client.h"
 #include "render.h"
 #include "progs.h"
-#include "progsvm.h"
 #include "server.h"
 
 #include "input.h"
@@ -210,25 +206,20 @@ extern char *buildstring;
 #include "keys.h"
 #include "console.h"
 #include "menu.h"
-#include "crc.h"
-#include "cdaudio.h"
 
 #include "glquake.h"
 
 #include "ui.h"
+#include "palette.h"
 
 extern qboolean noclip_anglehack;
 
-//
-// host
-//
-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)
+// 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;
@@ -249,8 +240,6 @@ void Host_Reconnect_f(void);
 // 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;
-
 //
 // chase
 //
@@ -263,8 +252,6 @@ 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"
-
 void Sys_Shared_Init(void);
 
 #endif