Revert "Initialize console commands and cvars before anything else"

[xonotic/darkplaces.git] / qtypes.h

diff --git a/qtypes.h b/qtypes.h
index 480b1e7fd6a4583e81e0065049b578dc10775cc8..4c834a312a5afb1c7d3399426c9b55575d765fa6 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,26 +2,16 @@
 #ifndef QTYPES_H
 #define QTYPES_H
 
-typedef unsigned char qbyte;
+#include <stdint.h>
+#include <stdbool.h>
+#include <inttypes.h>
 
-#undef true
-#undef false
-
-typedef enum {false, true} qboolean;
-
-#ifdef WIN32
-# define ssize_t long
-#endif
+typedef bool qboolean;
 
 #ifndef NULL
 #define NULL ((void *)0)
 #endif
 
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
 // up / down
 #define        PITCH   0
 
@@ -31,4 +21,37 @@ 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
+
+// LadyHavoc: upgrade the prvm to double precision for better time values
+// LadyHavoc: 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