X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=1d9c771560f161bf17d87f132abf139e61cd9e13;hb=aad158b86f1152258b6d0dc8052f2424c63ab5b7;hp=1c3dadd0d7e9dd8873a2a7c80502d4f1c26c0b67;hpb=56561de0acdb9cf29d155992440ac3e0d32909dd;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 1c3dadd0..1d9c7715 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,6 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef QUAKEDEF_H
 #define QUAKEDEF_H
 
+#if defined(__GNUC__) && (__GNUC__ > 2)
+#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>
@@ -35,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"
 
@@ -49,14 +55,13 @@ extern char *buildstring;
 #define MAX_PACKETFRAGMENT 1024		// max length of packet fragment
 #define NET_MAXMESSAGE	65536
 #define NET_MINRATE		1000 // limits "rate" and "sv_maxrate" cvars
-#define NET_MAXRATE		25000 // 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
@@ -70,7 +75,7 @@ extern char *buildstring;
 //
 #define	MAX_CL_STATS		256
 #define	STAT_HEALTH			0
-#define	STAT_FRAGS			1
+//#define	STAT_FRAGS			1
 #define	STAT_WEAPON			2
 #define	STAT_AMMO			3
 #define	STAT_ARMOR			4
@@ -89,6 +94,27 @@ extern char *buildstring;
 //#define STAT_TIME			17 // FTE
 //#define STAT_VIEW2		20 // FTE
 #define STAT_VIEWZOOM		21 // DP
+#define STAT_FRAGLIMIT								235 // DP
+#define STAT_TIMELIMIT								236 // DP
+#define STAT_MOVEVARS_WALLFRICTION					237 // DP
+#define STAT_MOVEVARS_FRICTION						238 // DP
+#define STAT_MOVEVARS_WATERFRICTION					239 // DP
+#define STAT_MOVEVARS_TICRATE						240 // DP
+#define STAT_MOVEVARS_TIMESCALE						241 // DP
+#define STAT_MOVEVARS_GRAVITY						242 // DP
+#define STAT_MOVEVARS_STOPSPEED						243 // DP
+#define STAT_MOVEVARS_MAXSPEED						244 // DP
+#define STAT_MOVEVARS_SPECTATORMAXSPEED				245 // DP
+#define STAT_MOVEVARS_ACCELERATE					246 // DP
+#define STAT_MOVEVARS_AIRACCELERATE					247 // DP
+#define STAT_MOVEVARS_WATERACCELERATE				248 // DP
+#define STAT_MOVEVARS_ENTGRAVITY					249 // DP
+#define STAT_MOVEVARS_JUMPVELOCITY					250 // DP
+#define STAT_MOVEVARS_EDGEFRICTION					251 // DP
+#define STAT_MOVEVARS_MAXAIRSPEED					252 // DP
+#define STAT_MOVEVARS_STEPHEIGHT					253 // DP
+#define STAT_MOVEVARS_AIRACCEL_QW					254 // DP
+#define STAT_MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION	255 // DP
 
 // stock defines
 
@@ -178,10 +204,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
+// 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"
@@ -202,6 +234,7 @@ extern char *buildstring;
 #include "sbar.h"
 #include "sound.h"
 #include "model_shared.h"
+#include "world.h"
 #include "client.h"
 #include "render.h"
 #include "progs.h"
@@ -209,38 +242,32 @@ extern char *buildstring;
 #include "server.h"
 
 #include "input.h"
-#include "world.h"
 #include "keys.h"
 #include "console.h"
 #include "menu.h"
 
 #include "glquake.h"
 
-#include "ui.h"
 #include "palette.h"
 
 extern qboolean noclip_anglehack;
 
+extern char engineversion[128];
 extern cvar_t developer;
 
-extern double host_frametime;
-// 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_StartVideo(void);
-void Host_Error(const char *error, ...);
-void Host_Frame(float time);
+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);
@@ -252,6 +279,7 @@ extern int current_skill;
 // chase
 //
 extern cvar_t chase_active;
+extern cvar_t cl_viewmodel_scale;
 
 void Chase_Init (void);
 void Chase_Reset (void);
@@ -259,6 +287,7 @@ void Chase_Update (void);
 
 void fractalnoise(unsigned char *noise, int size, int startgrid);
 void fractalnoisequick(unsigned char *noise, int size, int startgrid);
+float noise4f(float x, float y, float z, float w);
 
 void Sys_Shared_Init(void);