X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores_rules.qc;h=4d5296c81603503cafd812c5b5d59c29e1e7786e;hb=253cc10990569fd90917dba809ce03c90fc89336;hp=6343625c0fd0e8f1c2e79f0b03b1fd6eb54711ba;hpb=2ff5923b5d3acdd9ed21ee37481c69586a6a7bf4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index 6343625c0..4d5296c81 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -1,4 +1,14 @@ -float c1, c2, c3, c4; +#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; void CheckAllowedTeams (entity for_whom); // NOTE: SP_ constants may not be >= MAX_SCORE; ST_constants may not be >= MAX_TEAMSCORE @@ -37,10 +47,9 @@ 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); + ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true); } else - ScoreRules_basics(0, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, TRUE); + ScoreRules_basics(0, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true); ScoreRules_basics_end(); } -