X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=quakedef.h;h=657dbfd1de954448a6fbdc272e0066304fed210f;hp=66fdfb308c9ccffec4f6be4de38e7b5cece082d5;hb=2075ae43356d724bae305ce8fd36ea570718b14a;hpb=04917d73d7e3f4ab6465bc97879af1acb86a77c9 diff --git a/quakedef.h b/quakedef.h index 66fdfb30..657dbfd1 100644 --- a/quakedef.h +++ b/quakedef.h @@ -22,12 +22,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef QUAKEDEF_H #define QUAKEDEF_H +#ifdef __APPLE__ +# include +#endif + #if defined(__GNUC__) && (__GNUC__ > 2) #define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1))) #define DP_FUNC_PURE __attribute__ ((pure)) +#define DP_FUNC_NORETURN __attribute__ ((noreturn)) #else #define DP_FUNC_PRINTF(n) #define DP_FUNC_PURE +#define DP_FUNC_NORETURN #endif #include @@ -149,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 @@ -160,8 +166,8 @@ extern char engineversion[128]; #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_PARTICLEEFFECTNAME 4096 ///< maximum number of unique names of particle effects (for particleeffectnum) +#define MAX_PARTICLEEFFECTINFO 8192 ///< maximum number of unique particle effects (each name may associate with several of these) #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_DYNAMIC_TEXTURE_COUNT 64 ///< maximum number of dynamic textures (web browsers, playvideo, etc) @@ -172,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 @@ -394,7 +400,9 @@ extern char engineversion[128]; #include "input.h" #include "keys.h" #include "console.h" +#ifdef CONFIG_MENU #include "menu.h" +#endif #include "csprogs.h" extern qboolean noclip_anglehack; @@ -415,7 +423,24 @@ extern cvar_t sessionid; DP_OS_STR - "identifier" of the OS, more suited for code to use DP_ARCH_STR - "identifier" of the processor architecture */ -#if defined(__linux__) +#if defined(__ANDROID__) /* must come first because it also defines linux */ +# 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 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 +# define LINK_TO_ZLIB 1 +# define LINK_TO_LIBVORBIS 1 +# define DP_MOBILETOUCH 1 +# define DP_FREETYPE_STATIC 1 +#elif defined(__linux__) # define DP_OS_NAME "Linux" # define DP_OS_STR "linux" #elif defined(_WIN64) @@ -433,10 +458,6 @@ extern cvar_t sessionid; #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" @@ -508,7 +529,7 @@ void Host_InitCommands(void); void Host_Main(void); void Host_Shutdown(void); void Host_StartVideo(void); -void Host_Error(const char *error, ...) DP_FUNC_PRINTF(1); +void Host_Error(const char *error, ...) DP_FUNC_PRINTF(1) DP_FUNC_NORETURN; void Host_Quit_f(void); void Host_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1); void Host_ShutdownServer(void); @@ -551,7 +572,27 @@ void Sys_Shared_Init(void); #define ISWHITESPACEORCONTROL(ch) ((signed char) (ch) <= (signed char) ' ') +#ifdef PRVM_64 +#define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFFFFFFFFFF) // also match "negative zero" doubles of value 0x8000000000000000 +#define FLOAT_LOSSLESS_FORMAT "%.17g" +#define VECTOR_LOSSLESS_FORMAT "%.17g %.17g %.17g" +#else #define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFF) // also match "negative zero" floats of value 0x80000000 +#define FLOAT_LOSSLESS_FORMAT "%.9g" +#define VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g" +#endif + +// originally this was _MSC_VER +// but here we want to test the system libc, which on win32 is borked, and NOT the compiler +#ifdef WIN32 +#define INT_LOSSLESS_FORMAT_SIZE "I64" +#define INT_LOSSLESS_FORMAT_CONVERT_S(x) ((__int64)(x)) +#define INT_LOSSLESS_FORMAT_CONVERT_U(x) ((unsigned __int64)(x)) +#else +#define INT_LOSSLESS_FORMAT_SIZE "j" +#define INT_LOSSLESS_FORMAT_CONVERT_S(x) ((intmax_t)(x)) +#define INT_LOSSLESS_FORMAT_CONVERT_U(x) ((uintmax_t)(x)) +#endif #endif