Merge branch 'Mario/item_skins' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / scores_rules.qc

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index ac060dab532174d6782108c91857918c64d352a4..c1b7f4c5689a13b877641ae9b7ea252a22089fd5 100644 (file)
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -9,14 +9,14 @@
 
 int ScoreRules_teams;
 
-int NumTeams(int teams)
+bool IsTeamAvailable(int team_num)
 {
-       return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3));
+       return boolean(ScoreRules_teams & Team_TeamToBit(team_num));
 }
 
-int AvailableTeams()
+int NumTeams(int teams)
 {
-       return NumTeams(ScoreRules_teams);
+       return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3));
 }
 
 // NOTE: ST_constants may not be >= MAX_TEAMSCORE
@@ -30,6 +30,7 @@ void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled
                ScoreInfo_SetLabel_TeamScore(i, "", 0);
 
        ScoreRules_teams = teams;
+       AVAILABLE_TEAMS = NumTeams(teams);
 
        if(score_enabled)
                ScoreInfo_SetLabel_TeamScore(ST_SCORE, "score", stprio);
@@ -42,7 +43,8 @@ void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled
        if (!INDEPENDENT_PLAYERS)
        {
                ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES, "suicides", SFL_LOWER_IS_BETTER);
-               ScoreInfo_SetLabel_PlayerScore(SP_TEAMKILLS, "teamkills", SFL_LOWER_IS_BETTER);
+               if (teamplay)
+                       ScoreInfo_SetLabel_PlayerScore(SP_TEAMKILLS, "teamkills", SFL_LOWER_IS_BETTER);
        }
 
        if(score_enabled)
@@ -50,10 +52,10 @@ void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled
 
        ScoreInfo_SetLabel_PlayerScore(SP_DMG, "dmg", 0);
        ScoreInfo_SetLabel_PlayerScore(SP_DMGTAKEN, "dmgtaken", SFL_LOWER_IS_BETTER);
-       ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", 0);
 
+       ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", SFL_NOT_SORTABLE);
        if(STAT(SHOWFPS))
-               ScoreInfo_SetLabel_PlayerScore(SP_FPS, "fps", 0);
+               ScoreInfo_SetLabel_PlayerScore(SP_FPS, "fps", SFL_NOT_SORTABLE);
 }
 
 void ScoreRules_basics_end()