summaryrefslogtreecommitdiff
path: root/src/ui_multiplayer.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2011-03-25 19:59:39 +0300
committerAndrey Nazarov <skuller@skuller.net>2011-03-26 14:43:07 +0300
commitbc9ae76c1f5c91810cd36e5d19ccad3790b35715 (patch)
tree2c90fa2b993f10bc3924f53ea2fded0c8824d00c /src/ui_multiplayer.c
parente7a0d43b36389b2a0304b30963b8db18517fd8e6 (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_multiplayer.c')
-rw-r--r--src/ui_multiplayer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui_multiplayer.c b/src/ui_multiplayer.c
index 70b73ad..b97dddf 100644
--- a/src/ui_multiplayer.c
+++ b/src/ui_multiplayer.c
@@ -384,8 +384,8 @@ void M_Menu_Servers( void ) {
m_join.menu.size = Size;
m_join.menu.keydown = Keydown;
m_join.menu.free = Free;
- m_join.menu.image = uis.backgroundHandle;
- FastColorCopy( uis.color.background, m_join.menu.color );
+ m_join.menu.image = uis.backgroundHandle;
+ m_join.menu.color.u32 = uis.color.background.u32;
//
// server list