X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=2b539c999668bbcc5acca5304ef53100f7e37285;hp=d3aceac50b2b28e8f2606d74ab4fe4713b12bba7;hb=4faf95050c3c1a7a6963ff7fa768d6c87b3e7bc6;hpb=51c4ab5336d3887b618c13e5f566cf19636af951

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index d3aceac50..2b539c999 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -1,7 +1,10 @@
 #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>
 
 int ScoreRules_teams;
 
@@ -45,8 +48,8 @@ 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()
@@ -55,17 +58,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, {});
 }