X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=9e62f0d2eaac45d41de274b9cb1c22d7270cb3aa;hb=f57d9c23e169d7b996ee332adac7f2608024e177;hp=d27b54d634040dcf68f9bc8d8f674897616b790a;hpb=c1ab987e992c1c56ed9ea09426408f7b62ae5100;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index d27b54d6..9e62f0d2 100644
--- 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			65536
 #define	MAX_PACKETFRAGMENT		1024
 #define	MAX_EDICTS				4096
 #define	MAX_MODELS				1024
@@ -84,25 +84,43 @@ 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_LEVELNETWORKEYES	0 // no portal support
+#define	MAX_OCCLUSION_QUERIES	256
+
+#define MAX_NETWM_ICON 1026 // one 32x32
 
 #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_PARTICLETEXTURES	96
+#define	MAX_PARTICLEEFFECTNAME	256
+#define	MAX_PARTICLEEFFECTINFO	1024
+#define	MAX_PARTICLETEXTURES	256
 #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
+#define	MODLIST_TOTALSIZE		32
+#define	MAX_FAVORITESERVERS		32
+#define	MAX_DECALSYSTEM_QUEUE	64
+#define	PAINTBUFFER_SIZE		512
+#define	MAX_BINDMAPS			8
+#define	MAX_PARTICLES_INITIAL	32768
+#define	MAX_PARTICLES			32768
+#define	MAX_DECALS_INITIAL		1024
+#define	MAX_DECALS				1024
+#define	MAX_ENITIES_INITIAL		256
+#define	MAX_STATICENTITIES		256
+#define	MAX_EFFECTS				16
+#define	MAX_BEAMS				16
+#define	MAX_TEMPENTITIES		256
 #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
@@ -132,7 +150,11 @@ 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	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_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
@@ -142,7 +164,7 @@ extern char engineversion[128];
 #define	CACHEPICHASHSIZE		256 ///< number of hash buckets for accelerating 2D pic name lookups
 #define	MAX_PARTICLEEFFECTNAME	256 ///< maximum number of unique names of particle effects (for particleeffectnum)
 #define	MAX_PARTICLEEFFECTINFO	4096 ///< maximum number of unique particle effects (each name may associate with several of these)
-#define	MAX_PARTICLETEXTURES	1024 ///< maximum number of unique particle textures in the particle font
+#define	MAX_PARTICLETEXTURES	256 ///< maximum number of unique particle textures in the particle font
 #define	MAXCLVIDEOS				65 ///< maximum number of video streams being played back at once (1 is reserved for the playvideo command)
 #define	MAX_GECKO_INSTANCES		16 ///< maximum number of web browser textures active at once
 #define	MAX_DYNAMIC_TEXTURE_COUNT	64 ///< maximum number of dynamic textures (web browsers, playvideo, etc)
@@ -154,6 +176,20 @@ extern char engineversion[128];
 // NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS to total_channels = static sounds
 #define	MAX_DYNAMIC_CHANNELS	512
 #define	MAX_CHANNELS			1028
+#define	MODLIST_TOTALSIZE		256
+#define	MAX_FAVORITESERVERS		256
+#define	MAX_DECALSYSTEM_QUEUE	1024
+#define	PAINTBUFFER_SIZE		2048
+#define	MAX_BINDMAPS			8
+#define	MAX_PARTICLES_INITIAL	8192 ///< initial allocation for cl.particles
+#define	MAX_PARTICLES			1048576 ///< upper limit on cl.particles size
+#define	MAX_DECALS_INITIAL		8192 ///< initial allocation for cl.decals
+#define	MAX_DECALS				1048576 ///< upper limit on cl.decals size
+#define	MAX_ENITIES_INITIAL		256 ///< initial size of cl.entities
+#define	MAX_STATICENTITIES		1024 ///< limit on size of cl.static_entities
+#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)
 #endif
 
 
@@ -197,6 +233,10 @@ extern char engineversion[128];
 //#define STAT_TIME			17 ///< FTE
 //#define STAT_VIEW2		20 ///< FTE
 #define STAT_VIEWZOOM		21 ///< DP
+#define STAT_MOVEVARS_AIRCONTROL_PENALTY					221 ///< DP
+#define STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW 222 ///< DP
+#define STAT_MOVEVARS_AIRSTRAFEACCEL_QW 223 ///< DP
+#define STAT_MOVEVARS_AIRCONTROL_POWER					224 ///< DP
 #define STAT_MOVEFLAGS                              225 ///< DP
 #define STAT_MOVEVARS_WARSOWBUNNY_AIRFORWARDACCEL	226 ///< DP
 #define STAT_MOVEVARS_WARSOWBUNNY_ACCEL				227 ///< DP
@@ -232,6 +272,8 @@ extern char engineversion[128];
 // moveflags values
 #define MOVEFLAG_VALID 0x80000000
 #define MOVEFLAG_Q2AIRACCELERATE 0x00000001
+#define MOVEFLAG_NOGRAVITYONGROUND 0x00000002
+#define MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE 0x00000004
 
 // stock defines
 
@@ -359,9 +401,14 @@ 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;
 
+#define STARTCONFIGFILENAME "quake.rc"
+#define CONFIGFILENAME "config.cfg"
+
 /* Preprocessor macros to identify platform
     DP_OS_NAME 	- "friendly" name of the OS, for humans to read
     DP_OS_STR	- "identifier" of the OS, more suited for code to use
@@ -370,7 +417,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 +450,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"