turn "z value discarded" into VM_Warnings so one can backtrace them

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index a712fe734636bcdea2a84138914b3ea1cbcbaba2..f656b26f4eb6521bdc2576161f4d81be66c213ca 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -95,7 +95,6 @@ extern char engineversion[128];
 #define        MAX_PARTICLEEFFECTINFO  1024
 #define        MAX_PARTICLETEXTURES    256
 #define        MAXCLVIDEOS                             1
-#define        MAX_GECKO_INSTANCES             1
 #define        MAX_DYNAMIC_TEXTURE_COUNT       2
 #define        MAX_MAP_LEAFS                   8192
 
@@ -116,6 +115,9 @@ extern char engineversion[128];
 #define        MAX_EFFECTS                             16
 #define        MAX_BEAMS                               16
 #define        MAX_TEMPENTITIES                256
+#define SERVERLIST_TOTALSIZE           1024
+#define SERVERLIST_ANDMASKCOUNT                5
+#define SERVERLIST_ORMASKCOUNT         5
 #else
 #define        MAX_INPUTLINE                   16384 ///< maximum length of console commandline, QuakeC strings, and many other text processing buffers
 #define        CON_TEXTSIZE                    1048576 ///< max scrollback buffer characters in console
@@ -162,7 +164,6 @@ extern char engineversion[128];
 #define        MAX_PARTICLEEFFECTINFO  4096 ///< maximum number of unique particle effects (each name may associate with several of these)
 #define        MAX_PARTICLETEXTURES    256 ///< maximum number of unique particle textures in the particle font
 #define        MAXCLVIDEOS                             65 ///< maximum number of video streams being played back at once (1 is reserved for the playvideo command)
-#define        MAX_GECKO_INSTANCES             16 ///< maximum number of web browser textures active at once
 #define        MAX_DYNAMIC_TEXTURE_COUNT       64 ///< maximum number of dynamic textures (web browsers, playvideo, etc)
 #define        MAX_MAP_LEAFS                   65536 ///< maximum number of BSP leafs in world (8192 in Quake)
 
@@ -186,6 +187,9 @@ extern char engineversion[128];
 #define        MAX_EFFECTS                             256 ///< limit on size of cl.effects
 #define        MAX_BEAMS                               256 ///< limit on size of cl.beams
 #define        MAX_TEMPENTITIES                4096 ///< max number of temporary models visible per frame (certain sprite effects, certain types of CSQC entities also use this)
+#define SERVERLIST_TOTALSIZE           2048 ///< max servers in the server list
+#define SERVERLIST_ANDMASKCOUNT                16 ///< max items in server list AND mask
+#define SERVERLIST_ORMASKCOUNT         16 ///< max items in server list OR mask
 #endif
 
 
@@ -229,6 +233,7 @@ extern char engineversion[128];
 //#define STAT_TIME                    17 ///< FTE
 //#define STAT_VIEW2           20 ///< FTE
 #define STAT_VIEWZOOM          21 ///< DP
+#define STAT_MOVEVARS_AIRACCEL_QW_STRETCHFACTOR 220 ///< DP
 #define STAT_MOVEVARS_AIRCONTROL_PENALTY                                       221 ///< DP
 #define STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW 222 ///< DP
 #define STAT_MOVEVARS_AIRSTRAFEACCEL_QW 223 ///< DP
@@ -390,10 +395,7 @@ extern char engineversion[128];
 #include "keys.h"
 #include "console.h"
 #include "menu.h"
-
-#include "glquake.h"
-
-#include "palette.h"
+#include "csprogs.h"
 
 extern qboolean noclip_anglehack;
 
@@ -492,10 +494,16 @@ qboolean Sys_HaveSSE2(void);
 #define Sys_HaveSSE2() false
 #endif
 
+#include "glquake.h"
+
+#include "palette.h"
+
 /// 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;
+/// equal to Sys_DirtyTime() at the start of this host frame
+extern double host_dirtytime;
 
 void Host_InitCommands(void);
 void Host_Main(void);