r6010 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-27 12:28:58 -0500 (Fri, 27 Feb 2009)
New Revision: 6010

Modified:
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/client/sbar.qc
Log:
fix race columns


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-02-27 10:36:23 UTC (rev 6009)
+++ trunk/data/qcsrc/client/View.qc	2009-02-27 17:28:58 UTC (rev 6010)
@@ -571,7 +571,7 @@
 }
 
 // following vectors must be global to allow seamless switching between camera modes
-vector camera_offset, current_camera_offset, mouse_angles, current_angles, current_origin, camera_position, current_position;
+vector camera_offset, current_camera_offset, mouse_angles, current_angles, current_origin, current_position;
 void CSQC_Demo_Camera()
 {
 	float speed, attenuation, dimensions;

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-02-27 10:36:23 UTC (rev 6009)
+++ trunk/data/qcsrc/client/sbar.qc	2009-02-27 17:28:58 UTC (rev 6010)
@@ -356,19 +356,19 @@
 {
 	return strcat( // fteqcc sucks
 		"ping pl name | ",
-		"-teams,race,lms/kills -teams,race,lms/deaths -teams,lms/suicides -race,dm,tdm/frags ", // tdm already has this in "score"
+		"-teams,race,lms/kills -teams,lms/deaths -teams,lms,race/suicides -race,dm,tdm/frags ", // tdm already has this in "score"
 		"+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ",
 		"+lms/lives +lms/rank ",
 		"+kh/caps +kh/pushes +kh/destroyed ",
-		"+race/laps +race/time +race/fastest ",
+		"?+race/laps ?+race/time ?+race/fastest ",
 		"+as/objectives ",
-		"-lms/score");
+		"-lms,race/score");
 }
 
 void Cmd_Sbar_SetFields(float argc)
 {
 	float i, j, slash;
-	string str, pattern, subpattern, subpattern2;
+	string str, pattern;
 	float digit;
 	float have_name, have_primary, have_secondary, have_separator;
 	float missing;
@@ -410,8 +410,16 @@
 
 	for(i = 0; i < argc - 1; ++i)
 	{
+		float nocomplain;
 		str = argv(i+1);
 
+		nocomplain = FALSE;
+		if(substring(str, 0, 1) == "?")
+		{
+			nocomplain = TRUE;
+			str = substring(str, 1, strlen(str) - 1);
+		}
+
 		slash = strstrofs(str, "/", 0);
 		if(slash >= 0)
 		{
@@ -451,7 +459,8 @@
 			}
 			else
 			{
-				print(strcat("^1Error:^7 Unknown score field: '", str, "'\n"));
+				if not(nocomplain)
+					print(strcat("^1Error:^7 Unknown score field: '", str, "'\n"));
 				continue;
 			}
 :found
@@ -1693,7 +1702,6 @@
 void Sbar_DrawPressedKeys(void)
 {
 	vector pos, bgsize;
-	float center_y;
 	float pressedkeys;
 	
 	pos = stov(cvar_string("cl_showpressedkeys_position"));