diff options
Diffstat (limited to 'apps/plugins/doom/v_video.h')
-rw-r--r-- | apps/plugins/doom/v_video.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/apps/plugins/doom/v_video.h b/apps/plugins/doom/v_video.h index c4b8927109..cb23895068 100644 --- a/apps/plugins/doom/v_video.h +++ b/apps/plugins/doom/v_video.h | |||
@@ -53,7 +53,7 @@ | |||
53 | extern const byte *colrngs[]; | 53 | extern const byte *colrngs[]; |
54 | 54 | ||
55 | // symbolic indices into color translation table pointer array | 55 | // symbolic indices into color translation table pointer array |
56 | typedef enum | 56 | enum |
57 | { | 57 | { |
58 | CR_BRICK, //0 | 58 | CR_BRICK, //0 |
59 | CR_TAN, //1 | 59 | CR_TAN, //1 |
@@ -67,7 +67,8 @@ typedef enum | |||
67 | CR_YELLOW, //9 | 67 | CR_YELLOW, //9 |
68 | CR_BLUE2, //10 // proff | 68 | CR_BLUE2, //10 // proff |
69 | CR_LIMIT //11 //jff 2/27/98 added for range check | 69 | CR_LIMIT //11 //jff 2/27/98 added for range check |
70 | } crange_idx_e; | 70 | }; |
71 | typedef unsigned crange_idx_e; | ||
71 | //jff 1/16/98 end palette color range additions | 72 | //jff 1/16/98 end palette color range additions |
72 | 73 | ||
73 | #define CR_DEFAULT CR_RED /* default value for out of range colors */ | 74 | #define CR_DEFAULT CR_RED /* default value for out of range colors */ |
@@ -83,17 +84,18 @@ void V_InitColorTranslation(void); | |||
83 | // Allocates buffer screens, call before R_Init. | 84 | // Allocates buffer screens, call before R_Init. |
84 | void V_Init (void); | 85 | void V_Init (void); |
85 | 86 | ||
86 | enum patch_translation_e { | 87 | enum { |
87 | VPT_NONE = 0, // Normal | 88 | VPT_NONE = 0, // Normal |
88 | VPT_FLIP = 1, // Flip image horizontally | 89 | VPT_FLIP = 1, // Flip image horizontally |
89 | VPT_TRANS = 2, // Translate image via a translation table | 90 | VPT_TRANS = 2, // Translate image via a translation table |
90 | VPT_STRETCH = 4, // Stretch to compensate for high-res | 91 | VPT_STRETCH = 4, // Stretch to compensate for high-res |
91 | }; | 92 | }; |
93 | typedef unsigned patch_translation_e; | ||
92 | 94 | ||
93 | #ifndef GL_DOOM | 95 | #ifndef GL_DOOM |
94 | void V_CopyRect(int srcx, int srcy, int srcscrn, int width, int height, | 96 | void V_CopyRect(int srcx, int srcy, int srcscrn, int width, int height, |
95 | int destx, int desty, int destscrn, | 97 | int destx, int desty, int destscrn, |
96 | enum patch_translation_e flags); | 98 | patch_translation_e flags); |
97 | #else | 99 | #else |
98 | #define V_CopyRect(sx,sy,ss,w,h,dx,dy,ds,f) | 100 | #define V_CopyRect(sx,sy,ss,w,h,dx,dy,ds,f) |
99 | #endif /* GL_DOOM */ | 101 | #endif /* GL_DOOM */ |
@@ -111,14 +113,14 @@ void V_FillRect(int scrn, int x, int y, int width, int height, byte colour); | |||
111 | #define V_DrawMemPatch(x,y,s,p,t,f) gld_DrawPatchFromMem(x,y,p,t,f) | 113 | #define V_DrawMemPatch(x,y,s,p,t,f) gld_DrawPatchFromMem(x,y,p,t,f) |
112 | #else | 114 | #else |
113 | void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, | 115 | void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, |
114 | int cm, enum patch_translation_e flags); | 116 | int cm, patch_translation_e flags); |
115 | #endif | 117 | #endif |
116 | // V_DrawNumPatch - Draws the patch from lump num | 118 | // V_DrawNumPatch - Draws the patch from lump num |
117 | #ifdef GL_DOOM | 119 | #ifdef GL_DOOM |
118 | #define V_DrawNumPatch(x,y,s,l,t,f) gld_DrawNumPatch(x,y,l,t,f) | 120 | #define V_DrawNumPatch(x,y,s,l,t,f) gld_DrawNumPatch(x,y,l,t,f) |
119 | #else | 121 | #else |
120 | void V_DrawNumPatch(int x, int y, int scrn, int lump, | 122 | void V_DrawNumPatch(int x, int y, int scrn, int lump, |
121 | int cm, enum patch_translation_e flags); | 123 | int cm, patch_translation_e flags); |
122 | #endif | 124 | #endif |
123 | // V_DrawNamePatch - Draws the patch from lump "name" | 125 | // V_DrawNamePatch - Draws the patch from lump "name" |
124 | #ifdef GL_DOOM | 126 | #ifdef GL_DOOM |
@@ -140,7 +142,7 @@ int V_NamePatchHeight(const char* name); | |||
140 | // CPhipps - added const's, patch translation flags for stretching | 142 | // CPhipps - added const's, patch translation flags for stretching |
141 | #ifndef GL_DOOM | 143 | #ifndef GL_DOOM |
142 | void V_DrawBlock(int x, int y, int scrn, int width, int height, | 144 | void V_DrawBlock(int x, int y, int scrn, int width, int height, |
143 | const byte *src, enum patch_translation_e flags); | 145 | const byte *src, patch_translation_e flags); |
144 | #endif | 146 | #endif |
145 | 147 | ||
146 | /* cphipps 10/99: function to tile a flat over the screen */ | 148 | /* cphipps 10/99: function to tile a flat over the screen */ |
@@ -160,7 +162,7 @@ void V_MarkRect(int x, int y, int width,int height); | |||
160 | // CPhipps - function to convert a patch_t into a simple block bitmap | 162 | // CPhipps - function to convert a patch_t into a simple block bitmap |
161 | // Returns pointer to the malloc()'ed bitmap, and its width and height | 163 | // Returns pointer to the malloc()'ed bitmap, and its width and height |
162 | byte *V_PatchToBlock(const char* name, int cm, | 164 | byte *V_PatchToBlock(const char* name, int cm, |
163 | enum patch_translation_e flags, | 165 | patch_translation_e flags, |
164 | unsigned short* width, unsigned short* height); | 166 | unsigned short* width, unsigned short* height); |
165 | #else | 167 | #else |
166 | #define V_MarkRect(x,y,w,h) | 168 | #define V_MarkRect(x,y,w,h) |