Transifex autosync

[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 64c94001fbc5bcd9ab42caffd6d8c86604368a32..95f8b482edd65e2fdcf42903658399791cd4ed0f 100644 (file)
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -1,26 +1,22 @@
 #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"
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
+#include <server/client.qh>
+#include <server/scores.qh>
+#include <server/teamplay.qh>
 
 int ScoreRules_teams;
 
-void CheckAllowedTeams (entity for_whom);
-
-int NumTeams(int teams)
+bool IsTeamAvailable(int team_num)
 {
-       return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3));
+       return boolean(ScoreRules_teams & Team_TeamToBit(team_num));
 }
 
-int AvailableTeams()
+int NumTeams(int teams)
 {
-       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);
+       return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3));
 }
 
 // NOTE: ST_constants may not be >= MAX_TEAMSCORE
@@ -29,49 +25,56 @@ void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled
 {
        FOREACH(Scores, true, {
                ScoreInfo_SetLabel_PlayerScore(it, "", 0);
-    });
+       });
        for(int i = 0; i < MAX_TEAMSCORE; ++i)
                ScoreInfo_SetLabel_TeamScore(i, "", 0);
 
        ScoreRules_teams = teams;
+       AVAILABLE_TEAMS = NumTeams(teams);
 
        if(score_enabled)
-               ScoreInfo_SetLabel_TeamScore  (ST_SCORE,        "score",     stprio);
+               ScoreInfo_SetLabel_TeamScore(ST_SCORE, "score", stprio);
 
        if (!INDEPENDENT_PLAYERS)
-               ScoreInfo_SetLabel_PlayerScore(SP_KILLS,        "kills",     0);
+               ScoreInfo_SetLabel_PlayerScore(SP_KILLS, "kills", 0);
 
-       ScoreInfo_SetLabel_PlayerScore(SP_DEATHS,       "deaths",    SFL_LOWER_IS_BETTER);
+       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);
+               ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES, "suicides", SFL_LOWER_IS_BETTER);
+               if (teamplay)
+                       ScoreInfo_SetLabel_PlayerScore(SP_TEAMKILLS, "teamkills", SFL_LOWER_IS_BETTER);
        }
 
        if(score_enabled)
-               ScoreInfo_SetLabel_PlayerScore(SP_SCORE,        "score",     sprio);
+               ScoreInfo_SetLabel_PlayerScore(SP_SCORE, "score", sprio);
+
+       if (!INDEPENDENT_PLAYERS)
+       {
+               ScoreInfo_SetLabel_PlayerScore(SP_DMG, "dmg", 0);
+               ScoreInfo_SetLabel_PlayerScore(SP_DMGTAKEN, "dmgtaken", 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);
+               ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", SFL_NOT_SORTABLE);
+       }
 
        if(STAT(SHOWFPS))
-               ScoreInfo_SetLabel_PlayerScore(SP_FPS, "fps", 0);
+               ScoreInfo_SetLabel_PlayerScore(SP_FPS, "fps", SFL_NOT_SORTABLE);
 }
+
 void ScoreRules_basics_end()
 {
        ScoreInfo_Init(ScoreRules_teams);
 }
+
 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);
+       int teams = 0;
+       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, {});
 }