[nexuiz-commits] r7772 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-09-13 04:20:38 -0400 (Sun, 13 Sep 2009)
New Revision: 7772

Modified:
   trunk/data/qcsrc/client/sbar.qc
   trunk/data/qcsrc/client/teamradar.qc
   trunk/data/qcsrc/client/waypointsprites.qc
Log:
also fade out radar and waypoints, fix showpressedkeys bg not fading out


Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-09-13 08:06:32 UTC (rev 7771)
+++ trunk/data/qcsrc/client/sbar.qc	2009-09-13 08:20:38 UTC (rev 7772)
@@ -1886,7 +1886,7 @@
 	pos -= '-15 -6 0'; // adjust to the origin of these numbers
 
 	pressedkeys = getstatf(STAT_PRESSED_KEYS);
-	drawpic(pos + '-15   -6   0', "gfx/hud/keys/key_bg.tga",           bgsize, '1 1 1', .1, DRAWFLAG_NORMAL);
+	drawpic(pos + '-15   -6   0', "gfx/hud/keys/key_bg.tga",           bgsize, '1 1 1', 0.1 * sbar_alpha_fg, DRAWFLAG_NORMAL);
 	drawpic(pos + ' 83.5  9   0', ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"), ' 24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 	drawpic(pos + ' 32   -1.5 0', ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"),  ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 	drawpic(pos + '-11.5  9   0', ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"),     ' 24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);

Modified: trunk/data/qcsrc/client/teamradar.qc
===================================================================
--- trunk/data/qcsrc/client/teamradar.qc	2009-09-13 08:06:32 UTC (rev 7771)
+++ trunk/data/qcsrc/client/teamradar.qc	2009-09-13 08:20:38 UTC (rev 7772)
@@ -191,8 +191,8 @@
 	if(ons_showmap)
 	{
 		cl_teamradar_scale = 42; // dummy, not used (see zoommode)
-		cl_teamradar_background_alpha = 1;
-		cl_teamradar_foreground_alpha = 1;
+		cl_teamradar_background_alpha = 1 * (1 - cvar("_menu_alpha"));
+		cl_teamradar_foreground_alpha = 1 * (1 - cvar("_menu_alpha"));
 		cl_teamradar_rotation = cvar("cl_teamradar_rotation");
 		if(!cl_teamradar_rotation)
 			cl_teamradar_rotation = 4;
@@ -204,8 +204,8 @@
 	else
 	{
 		cl_teamradar_scale = cvar("cl_teamradar_scale");
-		cl_teamradar_background_alpha = cvar("cl_teamradar_background_alpha");
-		cl_teamradar_foreground_alpha = cvar("cl_teamradar_foreground_alpha");
+		cl_teamradar_background_alpha = cvar("cl_teamradar_background_alpha") * (1 - cvar("_menu_alpha"));
+		cl_teamradar_foreground_alpha = cvar("cl_teamradar_foreground_alpha") * (1 - cvar("_menu_alpha"));
 		cl_teamradar_rotation = cvar("cl_teamradar_rotation");
 		cl_teamradar_size = stov(cvar_string("cl_teamradar_size"));
 		cl_teamradar_position = stov(cvar_string("cl_teamradar_position"));
@@ -214,8 +214,8 @@
 		// others default to 0
 		// match this to defaultNexuiz.cfg!
 		if(!cl_teamradar_scale) cl_teamradar_scale = 4096;
-		if(!cl_teamradar_background_alpha) cl_teamradar_background_alpha = 0.4;
-		if(!cl_teamradar_foreground_alpha) cl_teamradar_foreground_alpha = 0.8;
+		if(!cl_teamradar_background_alpha) cl_teamradar_background_alpha = 0.4 * (1 - cvar("_menu_alpha"));
+		if(!cl_teamradar_foreground_alpha) cl_teamradar_foreground_alpha = 0.8 * (1 - cvar("_menu_alpha"));
 		if(!cl_teamradar_size_x) cl_teamradar_size_x = 128;
 		if(!cl_teamradar_size_y) cl_teamradar_size_y = cl_teamradar_size_x;
 

Modified: trunk/data/qcsrc/client/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/client/waypointsprites.qc	2009-09-13 08:06:32 UTC (rev 7771)
+++ trunk/data/qcsrc/client/waypointsprites.qc	2009-09-13 08:20:38 UTC (rev 7772)
@@ -383,9 +383,9 @@
 	waypointsprite_minalpha = cvar("g_waypointsprite_minalpha");
 	waypointsprite_distancealphaexponent = cvar("g_waypointsprite_distancealphaexponent");
 	waypointsprite_timealphaexponent = cvar("g_waypointsprite_timealphaexponent");
-	waypointsprite_scale = cvar("g_waypointsprite_scale");
+	waypointsprite_scale = cvar("g_waypointsprite_scale") * (1 - cvar("_menu_alpha"));
 	if(!waypointsprite_scale)
-		waypointsprite_scale = 1.0;
+		waypointsprite_scale = 1.0 * (1 - cvar("_menu_alpha"));
 
 	if(!waypointsprite_initialized)
 	{