X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=quakedef.h;h=7e1de4fedbefd77024da8b622dce0a24ec88ed0e;hp=4c75fc10082ece8821636fb9a9696b1a7b90ec91;hb=30765cee4b9bb4f0e189023788088d48a9bed7a0;hpb=b2980c1b70bd2c5a643d704a68a4868a06dbcaf6 diff --git a/quakedef.h b/quakedef.h index 4c75fc10..7e1de4fe 100644 --- a/quakedef.h +++ b/quakedef.h @@ -22,12 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef QUAKEDEF_H #define QUAKEDEF_H -/// on UNIX platforms we need to define this so that video saving does not cause a SIGFSZ (file size) signal when a video clip exceeds 2GB -#define _FILE_OFFSET_BITS 64 - -// for cd_linux.c -#define __KERNEL_STRICT_NAMES - #if defined(__GNUC__) && (__GNUC__ > 2) #define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1))) #define DP_FUNC_PURE __attribute__ ((pure)) @@ -65,7 +59,7 @@ extern char engineversion[128]; #define CMDBUFSIZE 131072 #define MAX_ARGS 80 -#define NET_MAXMESSAGE 32768 +#define NET_MAXMESSAGE 65536 #define MAX_PACKETFRAGMENT 1024 #define MAX_EDICTS 4096 #define MAX_MODELS 1024 @@ -73,7 +67,7 @@ extern char engineversion[128]; #define MAX_LIGHTSTYLES 64 #define MAX_STYLESTRING 16 #define MAX_SCOREBOARD 32 -#define MAX_SCOREBOARDNAME 64 +#define MAX_SCOREBOARDNAME 128 #define MAX_USERINFO_STRING 196 #define MAX_SERVERINFO_STRING 512 #define MAX_LOCALINFO_STRING 1 // not actually used by DP servers @@ -85,17 +79,21 @@ extern char engineversion[128]; #define MAX_SAVEGAMES 12 #define SAVEGAME_COMMENT_LENGTH 39 #define MAX_CLIENTNETWORKEYES 2 +#define MAX_LEVELNETWORKEYES 0 // no portal support #define MAX_OCCLUSION_QUERIES 256 +#define CRYPTO_HOSTKEY_HASHSIZE 256 +#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) #define CACHEPICHASHSIZE 256 #define MAX_PARTICLEEFFECTNAME 256 #define MAX_PARTICLEEFFECTINFO 1024 -#define MAX_PARTICLETEXTURES 96 +#define MAX_PARTICLETEXTURES 256 #define MAXCLVIDEOS 1 #define MAX_GECKO_INSTANCES 1 #define MAX_DYNAMIC_TEXTURE_COUNT 2 @@ -109,8 +107,8 @@ extern char engineversion[128]; #define MAX_DECALSYSTEM_QUEUE 64 #define PAINTBUFFER_SIZE 512 #define MAX_BINDMAPS 8 -#define MAX_PARTICLES_INITIAL 32768 -#define MAX_PARTICLES 32768 +#define MAX_PARTICLES_INITIAL 8192 +#define MAX_PARTICLES 8192 #define MAX_DECALS_INITIAL 1024 #define MAX_DECALS 1024 #define MAX_ENITIES_INITIAL 256 @@ -136,7 +134,7 @@ extern char engineversion[128]; #define MAX_LIGHTSTYLES 256 ///< max flickering light styles in level (note: affects savegame format) #define MAX_STYLESTRING 64 ///< max length of flicker pattern for light style #define MAX_SCOREBOARD 255 ///< max number of players in game at once (255 protocol limit) -#define MAX_SCOREBOARDNAME 64 ///< max length of player name in game +#define MAX_SCOREBOARDNAME 128 ///< max length of player name in game #define MAX_USERINFO_STRING 1280 ///< max length of infostring for PROTOCOL_QUAKEWORLD (196 in QuakeWorld) #define MAX_SERVERINFO_STRING 1280 ///< max length of server infostring for PROTOCOL_QUAKEWORLD (512 in QuakeWorld) #define MAX_LOCALINFO_STRING 32768 ///< max length of server-local infostring for PROTOCOL_QUAKEWORLD (32768 in QuakeWorld) @@ -147,18 +145,22 @@ 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 2 ///< max number of locations that can be added to pvs when culling network entities (must be at least 2 for prediction) +#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 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 + #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 #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) @@ -180,7 +182,7 @@ extern char engineversion[128]; #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 256 ///< limit on size of cl.static_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) @@ -227,6 +229,11 @@ 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 +#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 @@ -262,6 +269,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 @@ -362,6 +371,7 @@ extern char engineversion[128]; #include "r_textures.h" +#include "crypto.h" #include "draw.h" #include "screen.h" #include "netconn.h" @@ -382,10 +392,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; @@ -394,6 +400,9 @@ 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 @@ -417,6 +426,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" @@ -425,22 +438,61 @@ 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__) # if defined(__i386__) # define DP_ARCH_STR "686" +# define SSE_POSSIBLE +# ifdef __SSE__ +# define SSE_PRESENT +# endif +# ifdef __SSE2__ +# define SSE2_PRESENT +# endif # elif defined(__x86_64__) # define DP_ARCH_STR "x86_64" +# define SSE_PRESENT +# define SSE2_PRESENT # elif defined(__powerpc__) # define DP_ARCH_STR "ppc" # endif #elif defined(_WIN64) # define DP_ARCH_STR "x86_64" +# define SSE_PRESENT +# define SSE2_PRESENT #elif defined(WIN32) # define DP_ARCH_STR "x86" +# define SSE_POSSIBLE +#endif + +#ifdef SSE_PRESENT +# define SSE_POSSIBLE +#endif + +#ifdef NO_SSE +# undef SSE_PRESENT +# undef SSE_POSSIBLE +# undef SSE2_PRESENT +#endif + +#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