X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=61fc9f4c9e5e5521778427724f033bc756ff1338;hp=bf743fc08b9fa17d9cd106351b10663e85e8fe50;hb=89ebeb720e27015d795189b51745e1cd7ec5bdb0;hpb=7f62098bd33ec14fd1f113024305445b88b55cf1 diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index bf743fc08..61fc9f4c9 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -34,7 +34,6 @@ void ScoreRules_basics_end() } void ScoreRules_generic() { - CheckAllowedTeams(world); if(teams_matter) { CheckAllowedTeams(world); @@ -56,7 +55,7 @@ void ScoreRules_ctf() { float sp_score, sp_caps; sp_score = sp_caps = 0; - switch(autocvar_g_ctf_win_mode) + switch(g_ctf_win_mode) { case 0: // caps only sp_caps = SFL_SORT_PRIO_PRIMARY; @@ -202,3 +201,13 @@ void ScoreRules_keepaway() ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_DROPS, "drops", SFL_LOWER_IS_BETTER); ScoreRules_basics_end(); } + +// FreezeTag stuff +#define SP_FREEZETAG_REVIVALS 4 +void ScoreRules_freezetag() +{ + CheckAllowedTeams(world); + ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, TRUE); // SFL_SORT_PRIO_PRIMARY + ScoreInfo_SetLabel_PlayerScore(SP_FREEZETAG_REVIVALS, "revivals", 0); + ScoreRules_basics_end(); +}