made darkplaces compile successfully with g++ to test for errors C doesn't care about...

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 48a28d3cebfbd4a24f3b5603ddbc8b1dd7ad1d71..54c7fe3a40667a112a86a8e059b63b8f34e8293a 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,8 +22,9 @@ 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 <ctype.h>
 #include <math.h>
 #include <string.h>
 #include <stdarg.h>
@@ -34,6 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "qtypes.h"
 
 extern char *buildstring;
+extern char engineversion[128];
 
 #define GAMENAME "id1"
 
@@ -55,7 +57,7 @@ extern char *buildstring;
 //
 // LordHavoc: increased entity limit to 2048 from 600
 #define        MAX_EDICTS              32768           // FIXME: ouch! ouch! ouch!
-#define        MAX_LIGHTSTYLES 64
+#define        MAX_LIGHTSTYLES 256
 // LordHavoc: increased model and sound limits from 256 and 256 to 4096 and 4096 (and added protocol extensions accordingly to break the 256 barrier)
 #define        MAX_MODELS              4096
 #define        MAX_SOUNDS              4096
@@ -67,7 +69,7 @@ extern char *buildstring;
 //
 // stats are integers communicated to the client by the server
 //
-#define        MAX_CL_STATS            32
+#define        MAX_CL_STATS            256
 #define        STAT_HEALTH                     0
 #define        STAT_FRAGS                      1
 #define        STAT_WEAPON                     2
@@ -83,6 +85,11 @@ extern char *buildstring;
 #define        STAT_TOTALMONSTERS      12
 #define        STAT_SECRETS            13              // bumped on client side by svc_foundsecret
 #define        STAT_MONSTERS           14              // bumped by svc_killedmonster
+#define STAT_ITEMS                     15 // FTE, DP
+#define STAT_VIEWHEIGHT                16 // FTE, DP
+//#define STAT_TIME                    17 // FTE
+//#define STAT_VIEW2           20 // FTE
+#define STAT_VIEWZOOM          21 // DP
 
 // stock defines
 
@@ -188,7 +195,6 @@ extern char *buildstring;
 
 #include "r_textures.h"
 
-#include "wad.h"
 #include "draw.h"
 #include "screen.h"
 #include "netconn.h"
@@ -208,25 +214,18 @@ 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;
@@ -237,6 +236,7 @@ void Host_ClearMemory(void);
 void Host_InitCommands(void);
 void Host_Init(void);
 void Host_Shutdown(void);
+void Host_StartVideo(void);
 void Host_Error(const char *error, ...);
 void Host_Frame(float time);
 void Host_Quit_f(void);
@@ -244,11 +244,11 @@ void Host_ClientCommands(const char *fmt, ...);
 void Host_ShutdownServer(qboolean crash);
 void Host_Reconnect_f(void);
 
+void Host_AbortCurrentFrame(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
 //
@@ -261,8 +261,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