From c0fa4c2973a87163081c1af5ab01cf7dcfcb22b3 Mon Sep 17 00:00:00 2001 From: divverent Date: Tue, 4 Oct 2011 11:24:07 +0000 Subject: [PATCH] server list: allow more AND and OR masks (except in DP_SMALLMEMORY profile) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11392 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=691ac0330045dfcf51fda91fc7704e5fb56b3173 --- netconn.h | 3 --- quakedef.h | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/netconn.h b/netconn.h index f93d297e..ed2fc08d 100755 --- a/netconn.h +++ b/netconn.h @@ -229,10 +229,7 @@ extern mempool_t *netconn_mempool; extern cvar_t hostname; extern cvar_t developer_networking; -#define SERVERLIST_TOTALSIZE 2048 #define SERVERLIST_VIEWLISTSIZE SERVERLIST_TOTALSIZE -#define SERVERLIST_ANDMASKCOUNT 5 -#define SERVERLIST_ORMASKCOUNT 5 typedef enum serverlist_maskop_e { diff --git a/quakedef.h b/quakedef.h index 7e1de4fe..e9e31450 100644 --- a/quakedef.h +++ b/quakedef.h @@ -116,6 +116,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 @@ -186,6 +189,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 -- 2.39.2