X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=39dbd49a35ddc630c85c849624330e1785d30d01;hp=2b539c999668bbcc5acca5304ef53100f7e37285;hb=073cc17f87486bec59ac2b6f9c26bf1155dbd7d8;hpb=7a10cb570f0235bc18e8977f33216d83870eca8b

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 2b539c999..39dbd49a3 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -5,11 +5,10 @@
 #include "client.qh"
 #include "scores.qh"
 #include <common/gamemodes/rules.qh>
+#include "teamplay.qh"
 
 int ScoreRules_teams;
 
-void CheckAllowedTeams (entity for_whom);
-
 int NumTeams(int teams)
 {
 	return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3));
@@ -18,8 +17,6 @@ int NumTeams(int teams)
 int AvailableTeams()
 {
 	return NumTeams(ScoreRules_teams);
-	// NOTE: this method is unreliable, as forced teams set the c* globals to weird values
-	//return boolean(c1 >= 0) + boolean(c2 >= 0) + boolean(c3 >= 0) + boolean(c4 >= 0);
 }
 
 // NOTE: ST_constants may not be >= MAX_TEAMSCORE
@@ -43,7 +40,10 @@ void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled
 	ScoreInfo_SetLabel_PlayerScore(SP_DEATHS,       "deaths",    SFL_LOWER_IS_BETTER);
 
 	if (!INDEPENDENT_PLAYERS)
+	{
 		ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES,     "suicides",  SFL_LOWER_IS_BETTER);
+		ScoreInfo_SetLabel_PlayerScore(SP_TEAMKILLS,     "teamkills", SFL_LOWER_IS_BETTER);
+	}
 
 	if(score_enabled)
 		ScoreInfo_SetLabel_PlayerScore(SP_SCORE,        "score",     sprio);
@@ -51,6 +51,9 @@ 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);
+
+	if(STAT(SHOWFPS))
+		ScoreInfo_SetLabel_PlayerScore(SP_FPS, "fps", 0);
 }
 void ScoreRules_basics_end()
 {
@@ -59,12 +62,11 @@ void ScoreRules_basics_end()
 void ScoreRules_generic()
 {
     int teams = 0;
-	if (teamplay) {
-		CheckAllowedTeams(NULL);
-		if (c1 >= 0) teams |= BIT(0);
-		if (c2 >= 0) teams |= BIT(1);
-		if (c3 >= 0) teams |= BIT(2);
-		if (c4 >= 0) teams |= BIT(3);
+	if (teamplay)
+	{
+		entity balance = TeamBalance_CheckAllowedTeams(NULL);
+		teams = TeamBalance_GetAllowedTeams(balance);
+		TeamBalance_Destroy(balance);
 	}
 	GameRules_scoring(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, {});
 }