X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=d3aceac50b2b28e8f2606d74ab4fe4713b12bba7;hp=4d5296c81603503cafd812c5b5d59c29e1e7786e;hb=641c47df604de42c11c68a7d80813b29affcefb2;hpb=cfc1a19f21842b65814c855082b059b22ff0c392 diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index 4d5296c81..d3aceac50 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -1,25 +1,32 @@ -#if defined(CSQC) -#elif defined(MENUQC) -#elif defined(SVQC) - #include "../dpdefs/progsdefs.qh" - #include "../common/constants.qh" - #include "autocvars.qh" - #include "defs.qh" - #include "scores.qh" -#endif - -//float c1, c2, c3, c4; +#include "scores_rules.qh" + +#include "cl_client.qh" +#include "scores.qh" + +int ScoreRules_teams; + void CheckAllowedTeams (entity for_whom); -// NOTE: SP_ constants may not be >= MAX_SCORE; ST_constants may not be >= MAX_TEAMSCORE +int NumTeams(int teams) +{ + return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3)); +} + +int AvailableTeams() +{ + 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); +} + +// NOTE: ST_constants may not be >= MAX_TEAMSCORE // scores that should be in all modes: -float ScoreRules_teams; -void ScoreRules_basics(float teams, float sprio, float stprio, float score_enabled) +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; @@ -37,6 +44,10 @@ 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); + ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", 0); } void ScoreRules_basics_end() { @@ -46,8 +57,13 @@ void ScoreRules_generic() { if(teamplay) { - CheckAllowedTeams(world); - ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true); + 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); } else ScoreRules_basics(0, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true);