diff options
Diffstat (limited to 'apps/plugins/doom/w_wad.h')
-rw-r--r-- | apps/plugins/doom/w_wad.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/apps/plugins/doom/w_wad.h b/apps/plugins/doom/w_wad.h index f505f42cb7..05e25c17b0 100644 --- a/apps/plugins/doom/w_wad.h +++ b/apps/plugins/doom/w_wad.h | |||
@@ -73,7 +73,7 @@ typedef struct | |||
73 | 73 | ||
74 | // CPhipps - defined enum in wider scope | 74 | // CPhipps - defined enum in wider scope |
75 | // Ty 08/29/98 - add source field to identify where this lump came from | 75 | // Ty 08/29/98 - add source field to identify where this lump came from |
76 | typedef enum { | 76 | enum { |
77 | // CPhipps - define elements in order of 'how new/unusual' | 77 | // CPhipps - define elements in order of 'how new/unusual' |
78 | source_iwad=0, // iwad file load | 78 | source_iwad=0, // iwad file load |
79 | source_pre, // predefined lump | 79 | source_pre, // predefined lump |
@@ -81,7 +81,15 @@ typedef enum { | |||
81 | source_pwad, // pwad file load | 81 | source_pwad, // pwad file load |
82 | source_lmp, // lmp file load | 82 | source_lmp, // lmp file load |
83 | source_net // CPhipps | 83 | source_net // CPhipps |
84 | } wad_source_t; | 84 | }; |
85 | typedef unsigned wad_source_t; | ||
86 | |||
87 | enum { | ||
88 | ns_global=0, | ||
89 | ns_sprites, | ||
90 | ns_flats, | ||
91 | ns_colormaps | ||
92 | }; /* namespace */ | ||
85 | 93 | ||
86 | typedef struct | 94 | typedef struct |
87 | { | 95 | { |
@@ -97,12 +105,7 @@ typedef struct | |||
97 | int index, next; | 105 | int index, next; |
98 | 106 | ||
99 | // killough 4/17/98: namespace tags, to prevent conflicts between resources | 107 | // killough 4/17/98: namespace tags, to prevent conflicts between resources |
100 | enum { | 108 | unsigned namespace; |
101 | ns_global=0, | ||
102 | ns_sprites, | ||
103 | ns_flats, | ||
104 | ns_colormaps | ||
105 | } namespace; | ||
106 | 109 | ||
107 | int handle; | 110 | int handle; |
108 | int position; | 111 | int position; |