[nexuiz-commits] r8080 - in trunk/data: . qcsrc/client

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Oct 9 09:40:25 EDT 2009


Author: fruitiex
Date: 2009-10-09 09:40:25 -0400 (Fri, 09 Oct 2009)
New Revision: 8080

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/client/sbar.qc
Log:
cvar fade out/in speeds of scoreboard


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-10-09 13:18:30 UTC (rev 8079)
+++ trunk/data/defaultNexuiz.cfg	2009-10-09 13:40:25 UTC (rev 8080)
@@ -1253,6 +1253,8 @@
 seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha"
 seta sbar_scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
 seta sbar_scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" 
+seta sbar_scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
+seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
 seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
 seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"
 seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-10-09 13:18:30 UTC (rev 8079)
+++ trunk/data/qcsrc/client/sbar.qc	2009-10-09 13:40:25 UTC (rev 8080)
@@ -1119,12 +1119,19 @@
 		sbar_woulddrawscoreboard_prev = sbar_woulddrawscoreboard;
 	}
 
-	float scoreboard_fadeinspeed = 10;
-	float scoreboard_fadeoutspeed = 5;
-	if(sbar_woulddrawscoreboard)
-		sbar_scoreboard_fade_alpha = bound (0, (time - sbar_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1);
+	float scoreboard_fadeinspeed = cvar("sbar_scoreboard_fadeinspeed");
+	float scoreboard_fadeoutspeed = cvar("sbar_scoreboard_fadeoutspeed");
+	if(sbar_woulddrawscoreboard) {
+		if (scoreboard_fadeinspeed)
+			sbar_scoreboard_fade_alpha = bound (0, (time - sbar_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1);
+		else
+			sbar_scoreboard_fade_alpha = 1;
+	}
 	else
-		sbar_scoreboard_fade_alpha = bound (0, (1/scoreboard_fadeoutspeed - (time - sbar_woulddrawscoreboard_change)) * scoreboard_fadeoutspeed, 1);
+		if (scoreboard_fadeoutspeed)
+			sbar_scoreboard_fade_alpha = bound (0, (1/scoreboard_fadeoutspeed - (time - sbar_woulddrawscoreboard_change)) * scoreboard_fadeoutspeed, 1);
+		else
+			sbar_scoreboard_fade_alpha = 0;
 
 	if not(sbar_scoreboard_fade_alpha)
 		return;



More information about the nexuiz-commits mailing list