[nexuiz-commits] r8111 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-10-12 05:02:46 -0400 (Mon, 12 Oct 2009)
New Revision: 8111

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
Log:
r8109 | samual | 2009-10-12 04:08:32 -0400 (Mon, 12 Oct 2009) | 1 line
C0leanup cvar checks in sbar.qc under sbar_drawscoreboard, and add ping refresh interval cvar to control it client side. (Only affects scoreboard)
r8110 | samual | 2009-10-12 04:15:17 -0400 (Mon, 12 Oct 2009) | 1 line
Fix typo in typefrag message


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-10-12 08:15:17 UTC (rev 8110)
+++ branches/nexuiz-2.0/.patchsets	2009-10-12 09:02:46 UTC (rev 8111)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8086,8089-8089,8093-8102,8105-8107
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8086,8089-8089,8093-8102,8105-8110

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-10-12 08:15:17 UTC (rev 8110)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-10-12 09:02:46 UTC (rev 8111)
@@ -1266,6 +1266,7 @@
 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"
 seta sbar_hudselector 1	"0 = health/armor positions flipped, 1 = default hud layout, 2 = combined health and armor display"
+seta sbar_pingrefreshinterval 10 "refesh interval of ping display in the scoreboard: range 1 - 60 (In seconds)"
 seta sbar_hud_accuracy 0 "1 = weapon accuracy on the weapon icons"
 seta sbar_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type of the current weapon"
 seta sbar_increment_maptime 0	"1 = show elapsed time on the timer"

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-10-12 08:15:17 UTC (rev 8110)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-10-12 09:02:46 UTC (rev 8111)
@@ -1119,8 +1119,8 @@
 		sbar_woulddrawscoreboard_prev = sbar_woulddrawscoreboard;
 	}
 
-	float scoreboard_fadeinspeed = cvar("sbar_scoreboard_fadeinspeed");
-	float scoreboard_fadeoutspeed = cvar("sbar_scoreboard_fadeoutspeed");
+	float scoreboard_fadeinspeed = cvar_or("sbar_scoreboard_fadeinspeed", 10);
+	float scoreboard_fadeoutspeed = cvar_or("sbar_scoreboard_fadeoutspeed", 5);
 	if(sbar_woulddrawscoreboard) {
 		if (scoreboard_fadeinspeed)
 			sbar_scoreboard_fade_alpha = bound (0, (time - sbar_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1);
@@ -1137,38 +1137,17 @@
 		return;
 		
 	sbar_scoreboard_alpha_bg = cvar("sbar_scoreboard_alpha_bg") * sbar_scoreboard_fade_alpha;
-	if(cvar("sbar_scoreboard_alpha_fg"))
-		sbar_scoreboard_alpha_fg = cvar("sbar_scoreboard_alpha_fg") * sbar_scoreboard_fade_alpha;
-	else 
-		sbar_scoreboard_alpha_fg = 1;
-	
+	sbar_scoreboard_alpha_fg = cvar_or("sbar_scoreboard_alpha_fg", 1.0) * sbar_scoreboard_fade_alpha;
 	sbar_scoreboard_highlight = cvar("sbar_scoreboard_highlight");
+	sbar_scoreboard_highlight_alpha = cvar_or("sbar_scoreboard_highlight_alpha", 0.10) * sbar_scoreboard_alpha_fg;
+	sbar_scoreboard_highlight_alpha_self = cvar_or("sbar_scoreboard_highlight_alpha_self", 0.25) * sbar_scoreboard_alpha_fg;
+	sbar_scoreboard_alpha_name = cvar_or("sbar_scoreboard_alpha_name", 0.9) * sbar_scoreboard_alpha_fg;
+	sbar_scoreboard_alpha_name_self = cvar_or("sbar_scoreboard_alpha_name_self", 1) * sbar_scoreboard_alpha_fg;
 	
-	if(cvar("sbar_scoreboard_highlight_alpha"))
-		sbar_scoreboard_highlight_alpha = cvar("sbar_scoreboard_highlight_alpha") * sbar_scoreboard_fade_alpha;
-	else
-		sbar_scoreboard_highlight_alpha = 0.10;
-		
-	if(cvar("sbar_scoreboard_highlight_alpha_self"))
-		sbar_scoreboard_highlight_alpha_self = cvar("sbar_scoreboard_highlight_alpha_self") * sbar_scoreboard_fade_alpha;
-	else
-		sbar_scoreboard_highlight_alpha_self = 0.25;
-		
-	if(cvar("sbar_scoreboard_alpha_name"))
-		sbar_scoreboard_alpha_name = cvar("sbar_scoreboard_alpha_name") * sbar_scoreboard_fade_alpha;
-	else
-		sbar_scoreboard_alpha_name = 0.9;
-		
-	if(cvar("sbar_scoreboard_alpha_name_self"))
-		sbar_scoreboard_alpha_name_self = cvar("sbar_scoreboard_alpha_name_self") * sbar_scoreboard_fade_alpha;
-	else 
-		sbar_scoreboard_alpha_name_self = 1;
-
 	vector rgb, pos, tmp;
 	entity pl, tm;
 
-	if(time > lastpingstime + 10)
-	{
+	if(time > lastpingstime + bound(1, cvar_or("sbar_pingrefreshinterval", 10), 60)) {
 		localcmd("pings\n");
 		lastpingstime = time;
 	}

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2009-10-12 08:15:17 UTC (rev 8110)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2009-10-12 09:02:46 UTC (rev 8111)
@@ -374,7 +374,7 @@
 					centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 scored against you ^7", GetAdvancedDeathReports(attacker)));
 				} else {
 					if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {
-						centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You ^1typefragged ^7", s, GetAdvancedDeathReports(targ)));
+						centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typefragged ^7", s, GetAdvancedDeathReports(targ)));
 						centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typefragged by ^7", a, GetAdvancedDeathReports(attacker)));
 					} else { 
 						centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You fragged ^7", s, GetAdvancedDeathReports(targ)));