r3902 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-24 10:05:46 -0400 (Thu, 24 Jul 2008)
New Revision: 3902

Modified:
   trunk/data/qcsrc/server/keyhunt.qc
   trunk/data/qcsrc/server/scores.qc
Log:
fix sort orders for KH


Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2008-07-24 13:02:27 UTC (rev 3901)
+++ trunk/data/qcsrc/server/keyhunt.qc	2008-07-24 14:05:46 UTC (rev 3902)
@@ -986,15 +986,15 @@
 	ScoreInfo_SetLabel_TeamScore  (ST_SCORE,        "score",     SFL_SORT_PRIO_PRIMARY);
 	ScoreInfo_SetLabel_TeamScore  (ST_KH_CAPS,      "caps",      SFL_SORT_PRIO_MED);
 	ScoreInfo_SetLabel_PlayerScore(SP_KILLS,        "kills",     0);
-	ScoreInfo_SetLabel_PlayerScore(SP_DEATHS,       "deaths",    SFL_DECREASING);
+	ScoreInfo_SetLabel_PlayerScore(SP_DEATHS,       "deaths",    0);
 	ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES,     "suicides",  SFL_DECREASING);
 	ScoreInfo_SetLabel_PlayerScore(SP_SCORE,        "score",     SFL_SORT_PRIO_PRIMARY);
 	ScoreInfo_SetLabel_PlayerScore(SP_KH_COLLECT,   "collect",   0);
 	ScoreInfo_SetLabel_PlayerScore(SP_KH_LOSEKEY,   "losekey",   SFL_DECREASING);
 	ScoreInfo_SetLabel_PlayerScore(SP_KH_CAPS,      "caps",      SFL_SORT_PRIO_HIGH);
-	ScoreInfo_SetLabel_PlayerScore(SP_KH_PUSH,      "push",      SFL_SORT_PRIO_MED);
-	ScoreInfo_SetLabel_PlayerScore(SP_KH_DESTROYED, "destroyed", SFL_SORT_PRIO_MED | SFL_DECREASING);
-	ScoreInfo_SetLabel_PlayerScore(SP_KH_KCFRAG,    "kcfrag",    SFL_SORT_PRIO_MED);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_PUSH,      "push",      0);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_DESTROYED, "destroyed", SFL_DECREASING);
+	ScoreInfo_SetLabel_PlayerScore(SP_KH_KCFRAG,    "kcfrag",    0);
 #endif
 }
 

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2008-07-24 13:02:27 UTC (rev 3901)
+++ trunk/data/qcsrc/server/scores.qc	2008-07-24 14:05:46 UTC (rev 3902)
@@ -17,6 +17,8 @@
 
 vector ScoreField_Compare(entity t1, entity t2, .float field, float fieldflags, vector previous) // returns: cmp value, best prio
 {
+	if(!(fieldflags & SFL_SORT_PRIO_MASK)) // column does not sort
+		return previous;
 	if(fieldflags & SFL_SORT_PRIO_MASK < previous_y)
 		return previous;
 	if(t1.field == t2.field)