X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=ff021f17091b85fefa58e9eb167d4fe2d664e622;hb=85c0b97d3d2dd7306129d7ff7519fed9f8ae2b25;hp=66fdfb308c9ccffec4f6be4de38e7b5cece082d5;hpb=04917d73d7e3f4ab6465bc97879af1acb86a77c9;p=xonotic%2Fdarkplaces.git diff --git a/quakedef.h b/quakedef.h index 66fdfb30..ff021f17 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 @@ -108,8 +114,6 @@ extern char engineversion[128]; #define MAX_BINDMAPS 8 #define MAX_PARTICLES_INITIAL 8192 #define MAX_PARTICLES 8192 -#define MAX_DECALS_INITIAL 1024 -#define MAX_DECALS 1024 #define MAX_ENITIES_INITIAL 256 #define MAX_STATICENTITIES 256 #define MAX_EFFECTS 16 @@ -149,7 +153,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 +164,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 +176,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 @@ -180,8 +184,6 @@ extern char engineversion[128]; #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 @@ -233,6 +235,8 @@ extern char engineversion[128]; //#define STAT_TIME 17 ///< FTE //#define STAT_VIEW2 20 ///< FTE #define STAT_VIEWZOOM 21 ///< DP +#define MIN_VM_STAT 32 ///< stat range available to VM_SV_AddStat +#define MAX_VM_STAT 220 ///< stat range available to VM_SV_AddStat #define STAT_MOVEVARS_AIRACCEL_QW_STRETCHFACTOR 220 ///< DP #define STAT_MOVEVARS_AIRCONTROL_PENALTY 221 ///< DP #define STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW 222 ///< DP @@ -394,12 +398,15 @@ 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; extern cvar_t developer; +extern cvar_t developer_entityparsing; extern cvar_t developer_extra; extern cvar_t developer_insane; extern cvar_t developer_loadfile; @@ -415,7 +422,27 @@ 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 +#ifdef USEXMP +# define LINK_TO_LIBXMP 1 // nyov: if someone can test with the android NDK compiled libxmp? +#endif +# 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 +460,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" @@ -496,24 +519,35 @@ qboolean Sys_HaveSSE2(void); #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 -extern double realtime; -/// equal to Sys_DirtyTime() at the start of this host frame -extern double host_dirtytime; +typedef enum host_state_e +{ + host_shutdown, + host_init, + host_loading, + host_active +} host_state_t; + +typedef struct host_s +{ + int state; + int framecount; // incremented every frame, never reset (checked by Host_Error and Host_SaveConfig_f) + double realtime; // the accumulated mainloop time since application started (with filtering), without any slowmo or clamping + double dirtytime; // the main loop wall time for this frame, equal to Sys_DirtyTime() at the start of this host frame + jmp_buf abortframe; +} host_t; + +extern host_t host; 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_Quit_f(void); -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_Error(const char *error, ...) DP_FUNC_PRINTF(1) DP_FUNC_NORETURN; +void Host_Quit_f(cmd_state_t *cmd); +void SV_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1); +void SV_Shutdown(void); +void CL_Reconnect_f(cmd_state_t *cmd); +void Host_NoOperation_f(cmd_state_t *cmd); void Host_LockSession(void); void Host_UnlockSession(void); @@ -551,7 +585,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