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

diff --git a/netconn.h b/netconn.h
index f93d297eb6f52d78f49af8b5c9f004c65442d943..ed2fc08dd2c7ec51d1b9f497d6629f4665d22a5a 100755 (executable)
--- 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 7e1de4fedbefd77024da8b622dce0a24ec88ed0e..e9e314501373b72a0f2b2e8b0f24282b2387138a 100644 (file)
--- 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