X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=65a442549dd560816446c5a8210054f927da35d8;hb=68c980034e4b873496192d2797b06daf3446dca2;hp=57d2e537a8314168d8ee7e2b73780790e7e27c59;hpb=2b784d13eb570cf4d3cedf7f445d5947cc769646;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 57d2e537..65a44254 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>
@@ -50,7 +55,6 @@ extern char engineversion[128];
 #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
@@ -90,6 +94,25 @@ extern char engineversion[128];
 //#define STAT_TIME			17 // FTE
 //#define STAT_VIEW2		20 // FTE
 #define STAT_VIEWZOOM		21 // 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
 
@@ -184,8 +207,10 @@ extern char engineversion[128];
 // LordHavoc: increased name limit from 32 to 64 characters
 #define	MAX_SCOREBOARDNAME	64
 // infostring sizes used by QuakeWorld support
-#define MAX_USERINFO_STRING 196
-#define MAX_SERVERINFO_STRING 512
+// was 196
+#define MAX_USERINFO_STRING 1280
+// was 512
+#define MAX_SERVERINFO_STRING 1280
 #define MAX_LOCALINFO_STRING 32768
 
 #include "zone.h"
@@ -207,6 +232,7 @@ extern char engineversion[128];
 #include "sbar.h"
 #include "sound.h"
 #include "model_shared.h"
+#include "world.h"
 #include "client.h"
 #include "render.h"
 #include "progs.h"
@@ -214,7 +240,6 @@ extern char engineversion[128];
 #include "server.h"
 
 #include "input.h"
-#include "world.h"
 #include "keys.h"
 #include "console.h"
 #include "menu.h"
@@ -228,23 +253,18 @@ 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_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void Host_ShutdownServer(void);
 void Host_Reconnect_f(void);
 
@@ -257,6 +277,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);