X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=39dbd49a35ddc630c85c849624330e1785d30d01;hb=2109167b6ebf070d1797ac92a3f5f3a42578127e;hp=9c416472f40a207b0870c9bc5be4fc416502d48b;hpb=34e7f534e2015466228eb3a78c9857741b736dca;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 9c416472f..39dbd49a3 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -1,12 +1,14 @@
 #include "scores_rules.qh"
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
 #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));
@@ -15,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
@@ -40,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);
@@ -48,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()
 {
@@ -55,17 +61,12 @@ void ScoreRules_basics_end()
 }
 void ScoreRules_generic()
 {
-	if(teamplay)
+    int teams = 0;
+	if (teamplay)
 	{
-		CheckAllowedTeams(NULL);
-		int teams = 0;
-		if(c1 >= 0) teams |= BIT(0);
-		if(c2 >= 0) teams |= BIT(1);
-		if(c3 >= 0) teams |= BIT(2);
-		if(c4 >= 0) teams |= BIT(3);
-		ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true);
+		entity balance = TeamBalance_CheckAllowedTeams(NULL);
+		teams = TeamBalance_GetAllowedTeams(balance);
+		TeamBalance_Destroy(balance);
 	}
-	else
-		ScoreRules_basics(0, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true);
-	ScoreRules_basics_end();
+	GameRules_scoring(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, {});
 }