load the freetype library in Font_Init already, and don't call Font_Init twice

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index d27b54d634040dcf68f9bc8d8f674897616b790a..5770616a4193c99332ba9b87817eadc4c73b35fc 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "qtypes.h"
 
-extern char *buildstring;
+extern const char *buildstring;
 extern char engineversion[128];
 
 #define GAMENAME "id1"
@@ -62,10 +62,10 @@ extern char engineversion[128];
 #define        HIST_TEXTSIZE                   2048
 #define        HIST_MAXLINES                   16
 #define        MAX_ALIAS_NAME                  32
-#define        CMDBUFSIZE                              8192
-#define        MAX_ARGS                                10
+#define        CMDBUFSIZE                              131072
+#define        MAX_ARGS                                80
 
-#define        NET_MAXMESSAGE                  8192
+#define        NET_MAXMESSAGE                  32768
 #define        MAX_PACKETFRAGMENT              1024
 #define        MAX_EDICTS                              4096
 #define        MAX_MODELS                              1024
@@ -84,23 +84,24 @@ extern char engineversion[128];
 #define        MAX_DEMONAME                    16
 #define        MAX_SAVEGAMES                   12
 #define        SAVEGAME_COMMENT_LENGTH 39
-#define        MAX_CLIENTNETWORKEYES   1
+#define        MAX_CLIENTNETWORKEYES   2
+#define        MAX_OCCLUSION_QUERIES   256
 
 #define        MAX_WATERPLANES                 2
 #define        MAX_CUBEMAPS                    64
-//#define      MAX_EXPLOSIONS                  64
+#define        MAX_EXPLOSIONS                  8
 #define        MAX_DLIGHTS                             16
-#define        MAX_CACHED_PICS                 128 // this is 144 bytes each (or 152 on 64bit)
+#define        MAX_CACHED_PICS                 1024 // this is 144 bytes each (or 152 on 64bit)
 #define        CACHEPICHASHSIZE                256
-#define        MAX_PARTICLEEFFECTNAME  64
-#define        MAX_PARTICLEEFFECTINFO  256
+#define        MAX_PARTICLEEFFECTNAME  256
+#define        MAX_PARTICLEEFFECTINFO  2048
 #define        MAX_PARTICLETEXTURES    96
 #define        MAXCLVIDEOS                             1
 #define        MAX_GECKO_INSTANCES             1
 #define        MAX_DYNAMIC_TEXTURE_COUNT       2
 #define        MAX_MAP_LEAFS                   8192
 
-//#define      MAXTRACKS                               256
+#define        MAXTRACKS                               256
 #define        MAX_DYNAMIC_CHANNELS    64
 #define        MAX_CHANNELS                    260
 #else
@@ -132,7 +133,8 @@ extern char engineversion[128];
 #define        MAX_DEMONAME                    16 ///< max demo name length for demos command
 #define        MAX_SAVEGAMES                   12 ///< max savegames listed in savegame menu
 #define        SAVEGAME_COMMENT_LENGTH 39 ///< max comment length of savegame in menu
-#define        MAX_CLIENTNETWORKEYES   1 ///< max number of locations that can be added to pvs when culling network entities
+#define        MAX_CLIENTNETWORKEYES   2 ///< 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_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
@@ -359,6 +361,8 @@ extern char engineversion[128];
 extern qboolean noclip_anglehack;
 
 extern cvar_t developer;
+extern cvar_t developer_extra;
+extern cvar_t developer_insane;
 extern cvar_t developer_loadfile;
 extern cvar_t developer_loading;
 
@@ -370,7 +374,7 @@ extern cvar_t developer_loading;
 #if defined(__linux__)
 # define DP_OS_NAME            "Linux"
 # define DP_OS_STR             "linux"
-#elif defined(WIN64)
+#elif defined(_WIN64)
 # define DP_OS_NAME            "Windows64"
 # define DP_OS_STR             "win64"
 #elif defined(WIN32)
@@ -403,7 +407,7 @@ extern cvar_t developer_loading;
 # elif defined(__powerpc__)
 #  define DP_ARCH_STR          "ppc"
 # endif
-#elif defined(WIN64)
+#elif defined(_WIN64)
 # define DP_ARCH_STR           "x86_64"
 #elif defined(WIN32)
 # define DP_ARCH_STR           "x86"