HUD_Write_Cvar("hud_panel_scoreboard_table_highlight");
HUD_Write_Cvar("hud_panel_scoreboard_table_highlight_alpha");
HUD_Write_Cvar("hud_panel_scoreboard_table_highlight_alpha_self");
+ HUD_Write_Cvar("hud_panel_scoreboard_table_highlight_alpha_eliminated");
HUD_Write_Cvar("hud_panel_scoreboard_bg_teams_color_team");
HUD_Write_Cvar("hud_panel_scoreboard_accuracy_doublerows");
HUD_Write_Cvar("hud_panel_scoreboard_accuracy_nocolors");
bool sbt_highlight;
float sbt_highlight_alpha;
float sbt_highlight_alpha_self;
+float sbt_highlight_alpha_eliminated;
// provide basic panel cvars to old clients
// TODO remove them after a future release (0.8.2+)
bool autocvar_hud_panel_scoreboard_table_highlight = true;
float autocvar_hud_panel_scoreboard_table_highlight_alpha = 0.2;
float autocvar_hud_panel_scoreboard_table_highlight_alpha_self = 0.4;
+float autocvar_hud_panel_scoreboard_table_highlight_alpha_eliminated = 0.6;
float autocvar_hud_panel_scoreboard_bg_teams_color_team = 0;
float autocvar_hud_panel_scoreboard_namesize = 15;
float autocvar_hud_panel_scoreboard_team_size_position = 0;
bool autocvar_hud_panel_scoreboard_spectators_showping = true;
bool autocvar_hud_panel_scoreboard_spectators_aligned = false;
float autocvar_hud_panel_scoreboard_minwidth = 0.4;
+bool autocvar_hud_panel_scoreboard_playerid = false;
+string autocvar_hud_panel_scoreboard_playerid_prefix = "#";
+string autocvar_hud_panel_scoreboard_playerid_suffix = " ";
// mode 0: returns translated label
// mode 1: prints name and description of all the labels
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;
continue;
}
+ str = strtolower(str);
strcpy(sbt_field_title[sbt_num_fields], TranslateScoresLabel(str));
sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize);
- str = strtolower(str);
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;
- case "fps": sbt_field[sbt_num_fields] = SP_FPS; 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
- {
- if(!nocomplain)
- LOG_INFOF("^1Error:^7 Unknown score field: '%s'", str);
- continue;
- }
-LABEL(found)
+ // 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)
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];
sbt_field[sbt_num_fields] = SP_END;
}
+string Scoreboard_AddPlayerId(string pl_name, entity pl)
+{
+ string pref = autocvar_hud_panel_scoreboard_playerid_prefix;
+ string suf = autocvar_hud_panel_scoreboard_playerid_suffix;
+ return strcat(pref, itos(pl.sv_entnum + 1), suf, pl_name);
+}
+
// MOVEUP::
vector sbt_field_rgb;
string sbt_field_icon0;
return str;
case SP_NAME:
- return Scoreboard_GetName(pl);
+ str = Scoreboard_GetName(pl);
+ if (autocvar_hud_panel_scoreboard_playerid)
+ str = Scoreboard_AddPlayerId(str, pl);
+ return str;
case SP_FRAGS:
f = pl.(scores(SP_KILLS));
vector pos = item_pos;
// put a "self indicator" beside the self row, unicode U+25C0 (black left-pointing triangle)
if (is_self)
- drawstring(pos+eX*(panel_size.x+.5*hud_fontsize.x)+eY, "\xE2\x97\x80", vec2(hud_fontsize.x, hud_fontsize.y), rgb, panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawstring(pos + eX * (panel_size.x + 0.5 * hud_fontsize.x) + eY, "\xE2\x97\x80", hud_fontsize, rgb, panel_fg_alpha, DRAWFLAG_NORMAL);
pos.x += hud_fontsize.x * 0.5;
pos.y += (1.25 - 1) / 2 * hud_fontsize.y; // center text vertically
}
if(pl.eliminated)
- drawfill(h_pos, h_size, '0 0 0', 0.5 * panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawfill(h_pos, h_size, '0 0 0', sbt_highlight_alpha_eliminated, DRAWFLAG_NORMAL);
}
vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity ignored_pl, entity pl, int pl_number)
else if(autocvar_hud_panel_scoreboard_others_showscore)
field = Scoreboard_GetField(pl, SP_SCORE);
- string str = textShortenToWidth(entcs_GetName(pl.sv_entnum), namesize, hud_fontsize, stringwidth_colors);
+ string str = entcs_GetName(pl.sv_entnum);
+ if (autocvar_hud_panel_scoreboard_playerid)
+ str = Scoreboard_AddPlayerId(str, pl);
+ str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors);
float column_width = stringwidth(str, true, hud_fontsize);
if((this_team == NUM_SPECTATOR) && autocvar_hud_panel_scoreboard_spectators_aligned)
{
{
h_size.x = column_width + hud_fontsize.x * 0.25;
h_size.y = hud_fontsize.y;
- drawfill(pos - hud_fontsize.x * 0.25 * eX, h_size, '0 0 0', 0.5 * panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawfill(pos - hud_fontsize.x * 0.25 * eX, h_size, '0 0 0', sbt_highlight_alpha_eliminated, DRAWFLAG_NORMAL);
}
pos.x += column_width;
pos.x += hud_fontsize.x;
// frametime checks allow to toggle the scoreboard even when the game is paused
if(scoreboard_active) {
- if (scoreboard_fade_alpha < 1)
+ if (scoreboard_fade_alpha == 0)
scoreboard_time = time;
if(hud_configure_menu_open == 1)
scoreboard_fade_alpha = 1;
sbt_highlight = autocvar_hud_panel_scoreboard_table_highlight;
sbt_highlight_alpha = autocvar_hud_panel_scoreboard_table_highlight_alpha * panel_fg_alpha;
sbt_highlight_alpha_self = autocvar_hud_panel_scoreboard_table_highlight_alpha_self * panel_fg_alpha;
+ sbt_highlight_alpha_eliminated = autocvar_hud_panel_scoreboard_table_highlight_alpha_eliminated * panel_fg_alpha;
sbt_fg_alpha = autocvar_hud_panel_scoreboard_table_fg_alpha * panel_fg_alpha;
sbt_fg_alpha_self = autocvar_hud_panel_scoreboard_table_fg_alpha_self * panel_fg_alpha;