X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=80836bcb35051f49cdcdf423be1840ee340d4b4d;hb=42a9e3d7ece2c716e5cd6899e90841acb7fb891b;hp=4d5296c81603503cafd812c5b5d59c29e1e7786e;hpb=ea48961feb50159e05ef56f38b7fd0ebc15cc64e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index 4d5296c81..80836bcb3 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -1,14 +1,8 @@ -#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" + void CheckAllowedTeams (entity for_whom); // NOTE: SP_ constants may not be >= MAX_SCORE; ST_constants may not be >= MAX_TEAMSCORE @@ -37,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() {