r4712 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-10 11:21:05 -0400 (Fri, 10 Oct 2008)
New Revision: 4712

Modified:
   trunk/data/qcsrc/client/sbar.qc
Log:
fix fraglimit display for CTF


Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-10-10 15:01:53 UTC (rev 4711)
+++ trunk/data/qcsrc/client/sbar.qc	2008-10-10 15:21:05 UTC (rev 4712)
@@ -920,13 +920,26 @@
 		{
 			if(tl > 0)
 				str = strcat(str, " or");
-			str = strcat(str, " until ^3", ScoreString(scores_flags[ps_primary], fl));
-			if(scores_label[ps_primary] == "score")
-				str = strcat(str, " points^7");
-			else if(scores_label[ps_primary] == "fastest")
-				str = strcat(str, " is beaten^7");
+			if(teamplay)
+			{
+				str = strcat(str, " until ^3", ScoreString(teamscores_flags[ts_primary], fl));
+				if(teamscores_label[ts_primary] == "score")
+					str = strcat(str, " points^7");
+				else if(teamscores_label[ts_primary] == "fastest")
+					str = strcat(str, " is beaten^7");
+				else
+					str = strcat(str, " ", teamscores_label[ts_primary]);
+			}
 			else
-				str = strcat(str, " ", scores_label[ps_primary]);
+			{
+				str = strcat(str, " until ^3", ScoreString(scores_flags[ps_primary], fl));
+				if(scores_label[ps_primary] == "score")
+					str = strcat(str, " points^7");
+				else if(scores_label[ps_primary] == "fastest")
+					str = strcat(str, " is beaten^7");
+				else
+					str = strcat(str, " ", scores_label[ps_primary]);
+			}
 		}
 	}