X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=f0738de0fc6d3a5c3abb582405a1a4a8d7adc286;hb=e6049a665298fc06e457b168b8f1be8cf0877e33;hp=14b431e73bb6ebc5a46e29451a66960cc085a133;hpb=fc83bfe29745415b7ab325a045d637d901450b22;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 14b431e7..f0738de0 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,8 +22,14 @@ 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
+#ifdef __GNUC__
+#define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1)))
+#else
+#define DP_FUNC_PRINTF(n)
+#endif
 
+#include <sys/types.h>
+#include <ctype.h>
 #include <math.h>
 #include <string.h>
 #include <stdarg.h>
@@ -34,6 +40,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"
 
@@ -46,16 +53,15 @@ extern char *buildstring;
 #define	ON_EPSILON		0.1			// point on plane side epsilon
 
 #define MAX_PACKETFRAGMENT 1024		// max length of packet fragment
-// LordHavoc: this was 1024, now 65536
-#define	MAX_DATAGRAM	65536		// max length of unreliable
-#define	MAX_NETRELIABLE	65536		// max length of reliable message (fragments into unreliable packets)
+#define NET_MAXMESSAGE	65536
+#define NET_MINRATE		1000 // limits "rate" and "sv_maxrate" cvars
 
 //
 // per-level limits
 //
 // 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 from 64, NOTE special consideration is needed in savegames!
 // 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 +73,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 +89,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
 
@@ -172,12 +183,16 @@ extern char *buildstring;
 
 //===========================================
 
-// LordHavoc: increased player limit from 16 to 64
-#define	MAX_SCOREBOARD		64
+// LordHavoc: increased player limit from 16 to 255
+#define	MAX_SCOREBOARD		255
 // LordHavoc: increased name limit from 32 to 64 characters
 #define	MAX_SCOREBOARDNAME	64
-
-#define	SOUND_CHANNELS		8
+// infostring sizes used by QuakeWorld support
+// was 196
+#define MAX_USERINFO_STRING 1280
+// was 512
+#define MAX_SERVERINFO_STRING 1280
+#define MAX_LOCALINFO_STRING 32768
 
 #include "zone.h"
 #include "fs.h"
@@ -190,7 +205,6 @@ extern char *buildstring;
 
 #include "r_textures.h"
 
-#include "wad.h"
 #include "draw.h"
 #include "screen.h"
 #include "netconn.h"
@@ -210,52 +224,41 @@ 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 char engineversion[128];
 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)
-extern double host_realframetime;
 // incremented every frame, never reset
 extern int host_framecount;
 // not bounded in any way, changed at start of every frame, never reset
 extern double realtime;
 
-void Host_ClearMemory(void);
 void Host_InitCommands(void);
-void Host_Init(void);
+void Host_Main(void);
 void Host_Shutdown(void);
-void Host_Error(const char *error, ...);
-void Host_EndGame(const char *message, ...);
-void Host_Frame(float time);
+void Host_StartVideo(void);
+void Host_Error(const char *error, ...) DP_FUNC_PRINTF(1);
 void Host_Quit_f(void);
-void Host_ClientCommands(const char *fmt, ...);
-void Host_ShutdownServer(qboolean crash);
+void Host_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
+void Host_ShutdownServer(void);
 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
 //
 extern cvar_t chase_active;
+extern cvar_t cl_viewmodel_scale;
 
 void Chase_Init (void);
 void Chase_Reset (void);
@@ -264,8 +267,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