diff options
Diffstat (limited to 'apps/plugins/doom/doomtype.h')
-rw-r--r-- | apps/plugins/doom/doomtype.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/apps/plugins/doom/doomtype.h b/apps/plugins/doom/doomtype.h index 59b33758da..22e3ec6009 100644 --- a/apps/plugins/doom/doomtype.h +++ b/apps/plugins/doom/doomtype.h | |||
@@ -33,18 +33,9 @@ | |||
33 | #define __DOOMTYPE__ | 33 | #define __DOOMTYPE__ |
34 | #include "rockmacros.h" | 34 | #include "rockmacros.h" |
35 | 35 | ||
36 | #ifndef __BYTEBOOL__ | ||
37 | #define __BYTEBOOL__ | ||
38 | // Fixed to use builtin bool type with C++. | 36 | // Fixed to use builtin bool type with C++. |
39 | #ifdef __cplusplus | 37 | typedef unsigned int boolean; |
40 | typedef bool boolean; | ||
41 | #else | ||
42 | //typedef enum {false, true} boolean; | ||
43 | //#define boolean bool | ||
44 | typedef enum _boolean { FALSE, TRUE } boolean; | ||
45 | #endif | ||
46 | typedef unsigned char byte; | 38 | typedef unsigned char byte; |
47 | #endif | ||
48 | 39 | ||
49 | typedef signed long long int_64_t; | 40 | typedef signed long long int_64_t; |
50 | typedef unsigned long long uint_64_t; | 41 | typedef unsigned long long uint_64_t; |
@@ -63,7 +54,7 @@ typedef unsigned long long uint_64_t; | |||
63 | #define MINLONG ((long)0x80000000) | 54 | #define MINLONG ((long)0x80000000) |
64 | 55 | ||
65 | /* cph - move compatibility levels here so we can use them in d_server.c */ | 56 | /* cph - move compatibility levels here so we can use them in d_server.c */ |
66 | typedef enum { | 57 | enum { |
67 | doom_12_compatibility, /* Behave like early doom versions */ | 58 | doom_12_compatibility, /* Behave like early doom versions */ |
68 | doom_demo_compatibility, /* As compatible as possible for | 59 | doom_demo_compatibility, /* As compatible as possible for |
69 | * playing original Doom demos */ | 60 | * playing original Doom demos */ |
@@ -80,6 +71,7 @@ typedef enum { | |||
80 | /* Aliases follow */ | 71 | /* Aliases follow */ |
81 | boom_compatibility = boom_201_compatibility, /* Alias used by G_Compatibility */ | 72 | boom_compatibility = boom_201_compatibility, /* Alias used by G_Compatibility */ |
82 | best_compatibility = prboom_3_compatibility, | 73 | best_compatibility = prboom_3_compatibility, |
83 | } complevel_t; | 74 | }; |
75 | typedef unsigned complevel_t; | ||
84 | 76 | ||
85 | #endif | 77 | #endif |