reworked prediction code to work better when riding lifts

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index fe85c4ea48d43da85e3bfd477212c1acb06b9ec5..936ec175e1818575cbcf6fa42d4e3eb9223ede41 100644 (file)
--- 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
 
+#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>
 #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"
 
@@ -48,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
@@ -177,10 +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
+// 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"
@@ -201,47 +213,44 @@ 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"
+#include "progsvm.h"
 #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;
 
-// true if into command execution
-extern qboolean host_initialized;
-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_Error(const char *error, ...);
-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;
 
@@ -249,6 +258,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);