eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / qtypes.h

diff --git a/qtypes.h b/qtypes.h
index 4e82c72a7a97ed73563217437faa7bbd1c1d2b7f..7c525a69c234b731324103548da6f30116e836cb 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,12 +2,14 @@
 #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
 
 #if defined(WIN32) && !defined(WIN64)
 # define ssize_t long
@@ -18,8 +20,8 @@ typedef enum {false, true} qboolean;
 #endif
 
 #ifndef FALSE
-#define FALSE 0
-#define TRUE 1
+#define FALSE false
+#define TRUE true
 #endif
 
 // up / down