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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-10-04 11:49:23 -0400 (Sun, 04 Oct 2009)
New Revision: 8053

Modified:
   trunk/data/qcsrc/client/waypointsprites.qc
Log:
fix (i.e. reintroduce) waypointsprite alpha


Modified: trunk/data/qcsrc/client/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/client/waypointsprites.qc	2009-10-04 11:36:31 UTC (rev 8052)
+++ trunk/data/qcsrc/client/waypointsprites.qc	2009-10-04 15:49:23 UTC (rev 8053)
@@ -15,6 +15,7 @@
 float waypointsprite_distancefadealpha;
 float waypointsprite_distancefadescale;
 float waypointsprite_distancefadedistance;
+float waypointsprite_alpha;
 
 .float rule;
 .string netname; // primary picture
@@ -254,6 +255,7 @@
 	crosshairdistance = sqrt( pow(o_x - vid_conwidth/2, 2) + pow(o_y - vid_conheight/2, 2) );
 
 	t = waypointsprite_scale * vidscale;
+	a *= waypointsprite_alpha;
 
 	{
 		a = a * (1 - (1 - waypointsprite_distancefadealpha) * (bound(0, dist/waypointsprite_distancefadedistance, 1)));
@@ -413,7 +415,7 @@
 	waypointsprite_minalpha = cvar("g_waypointsprite_minalpha");
 	waypointsprite_distancealphaexponent = cvar("g_waypointsprite_distancealphaexponent");
 	waypointsprite_timealphaexponent = cvar("g_waypointsprite_timealphaexponent");
-	waypointsprite_scale = cvar_or("g_waypointsprite_scale", 1) * (1 - cvar("_menu_alpha"));
+	waypointsprite_scale = cvar_or("g_waypointsprite_scale", 1);
 	waypointsprite_edgefadealpha = cvar_or("g_waypointsprite_edgefadealpha", 1);
 	waypointsprite_edgefadescale = cvar_or("g_waypointsprite_edgefadescale", 1);
 	waypointsprite_edgefadedistance = cvar("g_waypointsprite_edgefadedistance");
@@ -423,6 +425,7 @@
 	waypointsprite_distancefadealpha = cvar_or("g_waypointsprite_distancefadealpha", 1);
 	waypointsprite_distancefadescale = cvar_or("g_waypointsprite_distancefadescale", 1);
 	waypointsprite_distancefadedistance = vlen(mi_max - mi_min) * cvar_or("g_waypointsprite_distancefadedistancemultiplier", 1);
+	waypointsprite_alpha = cvar_or("g_waypointsprite_alpha", 1) * (1 - cvar("_menu_alpha"));
 
 	if(!waypointsprite_initialized)
 	{