diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2011-03-25 19:59:39 +0300 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2011-03-26 14:43:07 +0300 |
| commit | bc9ae76c1f5c91810cd36e5d19ccad3790b35715 (patch) | |
| tree | 2c90fa2b993f10bc3924f53ea2fded0c8824d00c /src/gl_main.c | |
| parent | e7a0d43b36389b2a0304b30963b8db18517fd8e6 (diff) | |
Clean up and fix 32-bit color API.
Make color_t a union to work around aliasing issues. Get rid of
FastColorCopy macro in favor of direct assignment. Get rid of
DRAW_COLOR_* macros in favor of separate APIs for clearing and setting
32-bit color and alpha values. Rename R_DrawFill/R_DrawFillEx into
R_DrawFill8/R_DrawFill32 for consistency. Remove unused fields from
laser_t struct. Fix 32-bit particles fading out too soon. Fix console
text drawing with software renderer. Fix possible SCR_ParseColor buffer
overflow.
Diffstat (limited to 'src/gl_main.c')
| -rw-r--r-- | src/gl_main.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gl_main.c b/src/gl_main.c index ec3d9a6..6993fbd 100644 --- a/src/gl_main.c +++ b/src/gl_main.c @@ -338,13 +338,10 @@ static void GL_DrawSpriteModel( model_t *model ) { } static void GL_DrawNullModel( void ) { - static const color_t colors[6] = { - { 255, 0, 0, 255 }, - { 255, 0, 0, 255 }, - { 0, 255, 0, 255 }, - { 0, 255, 0, 255 }, - { 0, 0, 255, 255 }, - { 0, 0, 255, 255 } + static const uint32_t colors[6] = { + U32_RED, U32_RED, + U32_GREEN, U32_GREEN, + U32_BLUE, U32_BLUE }; entity_t *e = glr.ent; vec3_t points[6]; |