X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=65f241590335bffd34d37b7bbe89ae4193a9872d;hb=81636999067e87d67c76d931eb14c63cd4b6b9ef;hp=3ab283a288458dbddbe4885415510f69ffd48dab;hpb=721f1133fe3cca694dfeb6c0a90720f2e9bb72ad;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 3ab283a2..65f24159 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -86,7 +86,7 @@ extern char engineversion[128];
 #define MAX_NETWM_ICON 1026 // one 32x32
 
 #define	MAX_WATERPLANES			2
-#define	MAX_CUBEMAPS			64
+#define	MAX_CUBEMAPS			1024
 #define	MAX_EXPLOSIONS			8
 #define	MAX_DLIGHTS				16
 #define	MAX_CACHED_PICS			1024 // this is 144 bytes each (or 152 on 64bit)
@@ -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
@@ -153,7 +155,7 @@ extern char engineversion[128];
 #define MAX_NETWM_ICON 352822 // 16x16, 22x22, 24x24, 32x32, 48x48, 64x64, 128x128, 256x256, 512x512
 
 #define	MAX_WATERPLANES			16 ///< max number of water planes visible (each one causes additional view renders)
-#define	MAX_CUBEMAPS			256 ///< max number of cubemap textures loaded for light filters
+#define	MAX_CUBEMAPS			1024 ///< max number of cubemap textures loaded for light filters
 #define	MAX_EXPLOSIONS			64 ///< max number of explosion shell effects active at once (not particle related)
 #define	MAX_DLIGHTS				256 ///< max number of dynamic lights (rocket flashes, etc) in scene at once
 #define	MAX_CACHED_PICS			1024 ///< max number of 2D pics loaded at once
@@ -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
 
 
@@ -391,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;
 
@@ -404,6 +405,8 @@ extern cvar_t developer_insane;
 extern cvar_t developer_loadfile;
 extern cvar_t developer_loading;
 
+extern cvar_t sessionid;
+
 #define STARTCONFIGFILENAME "quake.rc"
 #define CONFIGFILENAME "config.cfg"
 
@@ -493,10 +496,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);
@@ -508,6 +517,8 @@ void Host_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void Host_ShutdownServer(void);
 void Host_Reconnect_f(void);
 void Host_NoOperation_f(void);
+void Host_LockSession(void);
+void Host_UnlockSession(void);
 
 void Host_AbortCurrentFrame(void);