Redesigned TaskQueue to have a queue and distributor model so that threads can keep...

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 5dd854a062d85ccf4c0b13dd0403bd6fd95c5055..36d19b57800afba5857609b2a3d5dc25dbf9c652 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef QUAKEDEF_H
 #define QUAKEDEF_H
 
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+#endif
+
 #if defined(__GNUC__) && (__GNUC__ > 2)
 #define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1)))
 #define DP_FUNC_PURE      __attribute__ ((pure))
@@ -151,7 +155,7 @@ extern char engineversion[128];
 #define        SAVEGAME_COMMENT_LENGTH 39 ///< max comment length of savegame in menu
 #define        MAX_CLIENTNETWORKEYES   16 ///< max number of locations that can be added to pvs when culling network entities (must be at least 2 for prediction)
 #define        MAX_LEVELNETWORKEYES    512 ///< max number of locations that can be added to pvs when culling network entities (must be at least 2 for prediction)
-#define        MAX_OCCLUSION_QUERIES   4096 ///< max number of GL_ARB_occlusion_query objects that can be used in one frame
+#define        MAX_OCCLUSION_QUERIES   4096 ///< max number of query objects that can be used in one frame
 
 #define CRYPTO_HOSTKEY_HASHSIZE 8192 ///< number of hash buckets for accelerating host key lookups
 #define MAX_NETWM_ICON 352822 // 16x16, 22x22, 24x24, 32x32, 48x48, 64x64, 128x128, 256x256, 512x512
@@ -174,7 +178,7 @@ extern char engineversion[128];
 // NUM_AMBIENTS to NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS - 1 = normal entity sounds
 // NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS to total_channels = static sounds
 #define        MAX_DYNAMIC_CHANNELS    512
-#define        MAX_CHANNELS                    1028
+#define        MAX_CHANNELS                    (8192 + 4)
 #define        MODLIST_TOTALSIZE               256
 #define        MAX_FAVORITESERVERS             256
 #define        MAX_DECALSYSTEM_QUEUE   1024
@@ -423,11 +427,12 @@ extern cvar_t sessionid;
 # define DP_OS_NAME            "Android"
 # define DP_OS_STR             "android"
 # define USE_GLES2             1
+# define USE_RWOPS             1
 # define LINK_TO_ZLIB  1
 # define LINK_TO_LIBVORBIS 1
 # define DP_MOBILETOUCH        1
 # define DP_FREETYPE_STATIC 1
-#elif defined(TARGET_OS_IPHONE) /* must come first because it also defines MACOSX */
+#elif TARGET_OS_IPHONE /* must come first because it also defines MACOSX */
 # define DP_OS_NAME            "iPhoneOS"
 # define DP_OS_STR             "iphoneos"
 # define USE_GLES2             1
@@ -525,11 +530,11 @@ void Host_Main(void);
 void Host_Shutdown(void);
 void Host_StartVideo(void);
 void Host_Error(const char *error, ...) DP_FUNC_PRINTF(1) DP_FUNC_NORETURN;
-void Host_Quit_f(void);
+void Host_Quit_f(cmd_state_t *cmd);
 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_Reconnect_f(cmd_state_t *cmd);
+void Host_NoOperation_f(cmd_state_t *cmd);
 void Host_LockSession(void);
 void Host_UnlockSession(void);