X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=d46d95bd1c6114ee5138527c74cb726afc8a7dab;hp=b93c114c06eb40f1c18fa829d3196a93a32ac795;hb=e520d4b32e53462b9e22a2a923f6ba2fe2909226;hpb=ccf145b9b0372a5b402465ab578ca48d943ffd88

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index b93c114c0..d46d95bd1 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -1,7 +1,11 @@
 #include "scores_rules.qh"
 
-#include "cl_client.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;
 
@@ -19,14 +23,14 @@ int AvailableTeams()
 	//return boolean(c1 >= 0) + boolean(c2 >= 0) + boolean(c3 >= 0) + boolean(c4 >= 0);
 }
 
-// NOTE: SP_ constants may not be >= MAX_SCORE; ST_constants may not be >= MAX_TEAMSCORE
+// 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)
 {
-	float i;
-	for(i = 0; i < MAX_SCORE; ++i)
-		ScoreInfo_SetLabel_PlayerScore(i, "", 0);
-	for(i = 0; i < MAX_TEAMSCORE; ++i)
+	FOREACH(Scores, true, {
+		ScoreInfo_SetLabel_PlayerScore(it, "", 0);
+    });
+	for(int i = 0; i < MAX_TEAMSCORE; ++i)
 		ScoreInfo_SetLabel_TeamScore(i, "", 0);
 
 	ScoreRules_teams = teams;
@@ -45,8 +49,9 @@ void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled
 	if(score_enabled)
 		ScoreInfo_SetLabel_PlayerScore(SP_SCORE,        "score",     sprio);
 
-	ScoreInfo_SetLabel_PlayerScore(SP_DMG, "damage", 0);
-	ScoreInfo_SetLabel_PlayerScore(SP_DMGTAKEN, "damagetaken", SFL_LOWER_IS_BETTER);
+	ScoreInfo_SetLabel_PlayerScore(SP_DMG, "dmg", 0);
+	ScoreInfo_SetLabel_PlayerScore(SP_DMGTAKEN, "dmgtaken", SFL_LOWER_IS_BETTER);
+	ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", 0);
 }
 void ScoreRules_basics_end()
 {
@@ -54,17 +59,13 @@ 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);
+		if (c1 >= 0) teams |= BIT(0);
+		if (c2 >= 0) teams |= BIT(1);
+		if (c3 >= 0) teams |= BIT(2);
+		if (c4 >= 0) teams |= BIT(3);
 	}
-	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, {});
 }