From 5ef1bbe9bc4c2bad0d8370c6d6a968e1427232ce Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 24 Jul 2008 14:05:46 +0000 Subject: [PATCH] fix sort orders for KH git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3902 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/keyhunt.qc | 8 ++++---- data/qcsrc/server/scores.qc | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data/qcsrc/server/keyhunt.qc b/data/qcsrc/server/keyhunt.qc index b97914c0d..7842dcd7e 100644 --- a/data/qcsrc/server/keyhunt.qc +++ b/data/qcsrc/server/keyhunt.qc @@ -986,15 +986,15 @@ void kh_init() // sets up th KH environment 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 } diff --git a/data/qcsrc/server/scores.qc b/data/qcsrc/server/scores.qc index 7cdf124c2..e02a53b31 100644 --- a/data/qcsrc/server/scores.qc +++ b/data/qcsrc/server/scores.qc @@ -17,6 +17,8 @@ float scores_initialized; 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) -- 2.39.2