X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=95f8b482edd65e2fdcf42903658399791cd4ed0f;hb=94d74449f36b5750f1d1450b02c3817f179211b1;hp=2749db38e63c081aa3aa9425c0e674c4e10c270e;hpb=4965bc2181364b5fb659bf2918208b7924e9dfb9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 2749db38e..95f8b482e 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -19,11 +19,6 @@ int NumTeams(int teams)
 	return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3));
 }
 
-int AvailableTeams()
-{
-	return NumTeams(ScoreRules_teams);
-}
-
 // NOTE: ST_constants may not be >= MAX_TEAMSCORE
 // scores that should be in all modes:
 void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled)
@@ -35,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);
@@ -47,18 +43,23 @@ 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)
 		ScoreInfo_SetLabel_PlayerScore(SP_SCORE, "score", sprio);
 
-	ScoreInfo_SetLabel_PlayerScore(SP_DMG, "dmg", 0);
-	ScoreInfo_SetLabel_PlayerScore(SP_DMGTAKEN, "dmgtaken", SFL_LOWER_IS_BETTER);
-	ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", 0);
+	if (!INDEPENDENT_PLAYERS)
+	{
+		ScoreInfo_SetLabel_PlayerScore(SP_DMG, "dmg", 0);
+		ScoreInfo_SetLabel_PlayerScore(SP_DMGTAKEN, "dmgtaken", SFL_LOWER_IS_BETTER);
+
+		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()