r3930 - in trunk/data/qcsrc: client common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-26 13:57:44 -0400 (Sat, 26 Jul 2008)
New Revision: 3930

Modified:
   trunk/data/qcsrc/client/sbar.qc
   trunk/data/qcsrc/common/constants.qh
   trunk/data/qcsrc/server/teamplay.qc
Log:
allow hiding the LMS rank column (as the players are sorted right anyway)


Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-07-26 17:54:30 UTC (rev 3929)
+++ trunk/data/qcsrc/client/sbar.qc	2008-07-26 17:57:44 UTC (rev 3930)
@@ -427,6 +427,10 @@
 		++sbar_num_fields;
 	}
 
+	if(scores_flags[ps_primary] & SFL_ALLOW_HIDE)
+		have_primary = 1;
+	if(scores_flags[ps_secondary] & SFL_ALLOW_HIDE)
+		have_secondary = 1;
 	if(ps_primary == ps_secondary)
 		have_secondary = 1;
 	missing = !have_primary + !have_secondary + !have_separator + !have_name;

Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh	2008-07-26 17:54:30 UTC (rev 3929)
+++ trunk/data/qcsrc/common/constants.qh	2008-07-26 17:57:44 UTC (rev 3930)
@@ -205,6 +205,11 @@
 #define SFL_HIDE_ZERO           2
 
 /**
+ * Allow a column to be hidden (do not automatically add it even if it is a sorting key)
+ */
+#define SFL_ALLOW_HIDE         16
+
+/**
  * Scoring priority (NOTE: PRIMARY is used for fraglimit)
  */
 #define SFL_SORT_PRIO_SECONDARY 4

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2008-07-26 17:54:30 UTC (rev 3929)
+++ trunk/data/qcsrc/server/teamplay.qc	2008-07-26 17:57:44 UTC (rev 3930)
@@ -246,7 +246,7 @@
 		ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES,     "suicides",  SFL_LOWER_IS_BETTER);
 		// do not define SP_SCORE for LMS
 		ScoreInfo_SetLabel_PlayerScore(SP_LMS_LIVES,    "lives",     SFL_SORT_PRIO_SECONDARY);
-		ScoreInfo_SetLabel_PlayerScore(SP_LMS_RANK,     "rank",      SFL_LOWER_IS_BETTER | SFL_HIDE_ZERO | SFL_SORT_PRIO_PRIMARY);
+		ScoreInfo_SetLabel_PlayerScore(SP_LMS_RANK,     "rank",      SFL_LOWER_IS_BETTER | SFL_HIDE_ZERO | SFL_SORT_PRIO_PRIMARY | SFL_ALLOW_HIDE);
 	}
 	else if(game == GAME_ARENA || cvar("g_arena"))
 	{