Merge branch 'master' into terencehill/hud_shake_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / scores_rules.qc

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 07d7267910cc7391e3e79deccdd4a1416289b4ec..72eeb9a1cccaf10d4ce3142a28a69cee0139ca53 100644 (file)
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -31,6 +31,9 @@ void ScoreRules_basics(float teams, float sprio, float stprio, float score_enabl
 
        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);
 }
 void ScoreRules_basics_end()
 {
@@ -40,7 +43,7 @@ void ScoreRules_generic()
 {
        if(teamplay)
        {
-               CheckAllowedTeams(world);
+               CheckAllowedTeams(NULL);
                ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true);
        }
        else