Fix a typo in DrawQ_RotPic which broke it badly.

[xonotic/darkplaces.git] / qtypes.h

diff --git a/qtypes.h b/qtypes.h
index 5e1d5750e75d98aeb52fcae922342f1541d0d7a1..83454bf65509d5df11f941bceb6efcea1d937d86 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,27 +2,22 @@
 #ifndef QTYPES_H
 #define QTYPES_H
 
-typedef unsigned char qbyte;
-
 #undef true
 #undef false
 
-typedef enum {false, true} qboolean;
+#ifndef __cplusplus
+typedef enum qboolean_e {false, true} qboolean;
+#else
+typedef bool qboolean;
+#endif
 
 #ifndef NULL
 #define NULL ((void *)0)
 #endif
 
 #ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
-//define       PARANOID                        // speed sapping error checking
-#ifdef _DEBUG
-#define ASSERT(condition) if (!(condition)) Sys_Error("assertion (##condition) failed at " __FILE__ ":" __LINE__ "\n");
-#else
-#define ASSERT(condition)
+#define FALSE false
+#define TRUE true
 #endif
 
 // up / down
@@ -34,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