server list: allow more AND and OR masks (except in DP_SMALLMEMORY profile)

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 03b87f732719fa62b17ced0ffad16110f0286a6d..e9e314501373b72a0f2b2e8b0f24282b2387138a 100644 (file)
--- 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)
@@ -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
@@ -153,7 +156,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
@@ -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
 
 
@@ -229,6 +235,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
@@ -391,10 +398,6 @@ extern char engineversion[128];
 #include "console.h"
 #include "menu.h"
 
-#include "glquake.h"
-
-#include "palette.h"
-
 extern qboolean noclip_anglehack;
 
 extern cvar_t developer;
@@ -429,6 +432,10 @@ extern cvar_t developer_loading;
 #elif defined(__OpenBSD__)
 # define DP_OS_NAME            "OpenBSD"
 # define DP_OS_STR             "openbsd"
+#elif defined(TARGET_OS_IPHONE)
+# define DP_OS_NAME            "iPhoneOS"
+# define DP_OS_STR             "iphoneos"
+# define USE_GLES2             1
 #elif defined(MACOSX)
 # define DP_OS_NAME            "Mac OS X"
 # define DP_OS_STR             "osx"
@@ -437,6 +444,7 @@ extern cvar_t developer_loading;
 # define DP_OS_STR             "morphos"
 #else
 # define DP_OS_NAME            "Unknown"
+# define DP_OS_STR             "unknown"
 #endif
 
 #if defined(__GNUC__)
@@ -475,12 +483,22 @@ extern cvar_t developer_loading;
 # undef SSE2_PRESENT
 #endif
 
-// for x86 cpus only...  (x64 has SSE2_PRESENT)
-#if defined(SSE_POSSIBLE) && !defined(SSE2_PRESENT)
+#ifdef SSE2_PRESENT
+#define Sys_HaveSSE() true
+#define Sys_HaveSSE2() true
+#elif defined(SSE_POSSIBLE)
+// runtime detection of SSE/SSE2 capabilities for x86
 qboolean Sys_HaveSSE(void);
 qboolean Sys_HaveSSE2(void);
+#else
+#define Sys_HaveSSE() false
+#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