X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=qtypes.h;h=83454bf65509d5df11f941bceb6efcea1d937d86;hp=4e82c72a7a97ed73563217437faa7bbd1c1d2b7f;hb=1ff3bc8e953680793a28ea923f2d1e58cdf2c9f0;hpb=7ccb3fb85096674f7bde0d7323946b03c005272a diff --git a/qtypes.h b/qtypes.h index 4e82c72a..83454bf6 100644 --- a/qtypes.h +++ b/qtypes.h @@ -2,15 +2,13 @@ #ifndef QTYPES_H #define QTYPES_H -typedef unsigned char qbyte; - #undef true #undef false -typedef enum {false, true} qboolean; - -#if defined(WIN32) && !defined(WIN64) -# define ssize_t long +#ifndef __cplusplus +typedef enum qboolean_e {false, true} qboolean; +#else +typedef bool qboolean; #endif #ifndef NULL @@ -18,8 +16,8 @@ typedef enum {false, true} qboolean; #endif #ifndef FALSE -#define FALSE 0 -#define TRUE 1 +#define FALSE false +#define TRUE true #endif // up / down @@ -31,4 +29,40 @@ typedef enum {false, true} qboolean; // fall over #define ROLL 2 +#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1400) +#define RESTRICT __restrict +#else +#define RESTRICT +#endif + +typedef long long dpint64; +typedef unsigned long long dpuint64; + +// LordHavoc: upgrade the prvm to double precision for better time values +// LordHavoc: to be enabled when bugs are worked out... +#define PRVM_64 +#ifdef PRVM_64 +typedef double prvm_vec_t; +typedef long long prvm_int_t; +typedef unsigned long long prvm_uint_t; +#else +typedef float prvm_vec_t; +typedef int prvm_int_t; +typedef unsigned int prvm_uint_t; +#endif +typedef prvm_vec_t prvm_vec3_t[3]; + +#ifdef VEC_64 +typedef double vec_t; +#else +typedef float vec_t; +#endif +typedef vec_t vec2_t[2]; +typedef vec_t vec3_t[3]; +typedef vec_t vec4_t[4]; +typedef vec_t vec5_t[5]; +typedef vec_t vec6_t[6]; +typedef vec_t vec7_t[7]; +typedef vec_t vec8_t[8]; + #endif