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/ui_demos.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/ui_demos.c')
| -rw-r--r-- | src/ui_demos.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui_demos.c b/src/ui_demos.c index 9df4739..dd322b9 100644 --- a/src/ui_demos.c +++ b/src/ui_demos.c @@ -522,7 +522,7 @@ static void Draw( menuFrameWork_t *self ) { Menu_Draw( self ); if( uis.width >= 640 ) { UI_DrawString( uis.width, uis.height - CHAR_HEIGHT, - NULL, UI_RIGHT, m_demos.status ); + UI_RIGHT, m_demos.status ); } } @@ -589,7 +589,7 @@ void M_Menu_Demos( void ) { m_demos.menu.keydown = Keydown; m_demos.menu.free = Free; m_demos.menu.image = uis.backgroundHandle; - FastColorCopy( uis.color.background, m_demos.menu.color ); + m_demos.menu.color.u32 = uis.color.background.u32; m_demos.list.generic.type = MTYPE_LIST; m_demos.list.generic.flags = QMF_HASFOCUS; |