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

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-09-11 13:42:53 -0400 (Fri, 11 Sep 2009)
New Revision: 7741

Modified:
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/client/sbar.qc
Log:
also hide crosshair when the menu is opened


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-09-11 17:24:01 UTC (rev 7740)
+++ trunk/data/qcsrc/client/View.qc	2009-09-11 17:42:53 UTC (rev 7741)
@@ -613,8 +613,8 @@
                 wcross_color_x = cvar("crosshair_color_red");
                 wcross_color_y = cvar("crosshair_color_green");
                 wcross_color_z = cvar("crosshair_color_blue");
-                wcross_alpha = cvar("crosshair_color_alpha");
-                wcross_sizefloat = cvar("crosshair_size");
+                wcross_alpha = cvar("crosshair_color_alpha") * (1-cvar("_menu_alpha"));
+                wcross_sizefloat = cvar("crosshair_size") * (1-cvar("_menu_alpha"));
                 if (cvar("crosshair_per_weapon")) {
                     e = get_weaponinfo(activeweapon);
                     if (e && e.netname != "")

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-09-11 17:24:01 UTC (rev 7740)
+++ trunk/data/qcsrc/client/sbar.qc	2009-09-11 17:42:53 UTC (rev 7741)
@@ -2197,7 +2197,7 @@
 		pos_x = bottomleft_x;
 		pos_y = bottom_y - 50 - sbar_fontsize_spec_y;
 		s = textShortenToWidth(s, vid_conwidth/2.5/sbar_fontsize_spec_x, stringwidth_colors);
-		drawcolorcodedstring(pos, s, sbar_fontsize_spec, 1, DRAWFLAG_NORMAL);
+		drawcolorcodedstring(pos, s, sbar_fontsize_spec, sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 		// spectator text in the upper right corner
 		if(spectatee_status == -1)