void PrintScoresLabels() { Label_getInfo(string_null, 1); }
string TranslateScoresLabel(string label) { return Label_getInfo(label, 0); }
+#define SB_EXTRA_SORTING_FIELDS 5
+PlayerScoreField sb_extra_sorting_field[SB_EXTRA_SORTING_FIELDS];
void Scoreboard_InitScores()
{
int i, f;
ps_primary = it;
if(f == SFL_SORT_PRIO_SECONDARY)
ps_secondary = it;
+ if(ps_primary == it || ps_secondary == it)
+ continue;
+ if (scores_label(it) == "kills") sb_extra_sorting_field[0] = it;
+ if (scores_label(it) == "deaths") sb_extra_sorting_field[1] = it;
+ if (scores_label(it) == "suicides") sb_extra_sorting_field[2] = it;
+ if (scores_label(it) == "dmg") sb_extra_sorting_field[3] = it;
+ if (scores_label(it) == "dmgtaken") sb_extra_sorting_field[4] = it;
});
if(ps_secondary == NULL)
ps_secondary = ps_primary;
return false;
}
- r = Scoreboard_CompareScore(left.scores(ps_primary), right.scores(ps_primary), scores_flags(ps_primary));
- if (r >= 0)
- return r;
-
- r = Scoreboard_CompareScore(left.scores(ps_secondary), right.scores(ps_secondary), scores_flags(ps_secondary));
- if (r >= 0)
- return r;
+ entity fld = NULL;
+ for (int i = -2; i < SB_EXTRA_SORTING_FIELDS; ++i)
+ {
+ if (i < 0)
+ {
+ if (!fld) fld = ps_primary;
+ else if (ps_secondary == ps_primary) continue;
+ else fld = ps_secondary;
+ }
+ else
+ {
+ fld = sb_extra_sorting_field[i];
+ if (fld == ps_primary || fld == ps_secondary) continue;
+ }
+ if (!fld) continue;
- FOREACH(Scores, true, {
- r = Scoreboard_CompareScore(left.scores(it), right.scores(it), scores_flags(it));
+ r = Scoreboard_CompareScore(left.scores(fld), right.scores(fld), scores_flags(fld));
if (r >= 0) return r;
- });
+ }
if (left.sv_entnum < right.sv_entnum)
return true;
PlayerScoreField j;
switch(str)
{
+ // fields without a label (not networked via the score system)
case "ping": sbt_field[sbt_num_fields] = SP_PING; break;
case "pl": sbt_field[sbt_num_fields] = SP_PL; break;
- case "kd": case "kdr": case "kdratio": sbt_field[sbt_num_fields] = SP_KDRATIO; break;
- case "sum": case "diff": case "k-d": sbt_field[sbt_num_fields] = SP_SUM; break;
case "name": case "nick": sbt_field[sbt_num_fields] = SP_NAME; have_name = true; break;
case "|": sbt_field[sbt_num_fields] = SP_SEPARATOR; have_separator = true; break;
- case "elo": sbt_field[sbt_num_fields] = SP_ELO; break;
- case "dmg": case "damage": sbt_field[sbt_num_fields] = SP_DMG; break;
- case "dmgtaken": case "damagetaken": sbt_field[sbt_num_fields] = SP_DMGTAKEN; break;
- default:
+ case "kd": case "kdr": case "kdratio": sbt_field[sbt_num_fields] = SP_KDRATIO; break;
+ case "sum": case "diff": case "k-d": sbt_field[sbt_num_fields] = SP_SUM; break;
+ case "frags": sbt_field[sbt_num_fields] = SP_FRAGS; break;
+ default: // fields with a label
{
+ // map alternative labels
+ if (str == "damage") str = "dmg";
+ if (str == "damagetaken") str = "dmgtaken";
+
FOREACH(Scores, true, {
if (str == strtolower(scores_label(it))) {
j = it;
}
});
-LABEL(notfound)
- if(str == "frags")
- j = SP_FRAGS;
- else
- {
- // NOTE: can't check STAT(SHOWFPS) here, if checked too early it returns false anyway
- if(!nocomplain && str != "fps") // server can disable the fps field
- LOG_INFOF("^1Error:^7 Unknown score field: '%s'", str);
+ // NOTE: can't check STAT(SHOWFPS) here, if checked too early it returns false anyway
+ if(!nocomplain && str != "fps") // server can disable the fps field
+ LOG_INFOF("^1Error:^7 Unknown score field: '%s'", str);
- strfree(sbt_field_title[sbt_num_fields]);
- sbt_field_size[sbt_num_fields] = 0;
- continue;
- }
-LABEL(found)
+ strfree(sbt_field_title[sbt_num_fields]);
+ sbt_field_size[sbt_num_fields] = 0;
+ continue;
+
+ LABEL(found)
sbt_field[sbt_num_fields] = j;
if(j == ps_primary)
have_primary = true;
{
if(!have_name)
{
- strunzone(sbt_field_title[sbt_num_fields]);
+ strfree(sbt_field_title[sbt_num_fields]);
for(i = sbt_num_fields; i > 0; --i)
{
sbt_field_title[i] = sbt_field_title[i-1];
if(!have_separator)
{
- strunzone(sbt_field_title[sbt_num_fields]);
+ strfree(sbt_field_title[sbt_num_fields]);
for(i = sbt_num_fields; i > 1; --i)
{
sbt_field_title[i] = sbt_field_title[i-1];