X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fscoreboard.qc;h=416564cc9c0121d8501d177307921b8401914d5f;hp=39deff0d1c36e202696428237d93589679eb4195;hb=9219e1f701c6cdda3d0b5344d06078c5ae8769d4;hpb=078ce4c20d41f3de56ef3631d71b399cb83fde8e diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 39deff0d1..416564cc9 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -34,6 +35,7 @@ void Scoreboard_Draw_Export(int fh) 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"); + HUD_Write_Cvar("hud_panel_scoreboard_spectators_position"); } const int MAX_SBT_FIELDS = MAX_SCORE; @@ -80,6 +82,7 @@ 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; +float autocvar_hud_panel_scoreboard_spectators_position = 1; bool autocvar_hud_panel_scoreboard_accuracy = true; bool autocvar_hud_panel_scoreboard_accuracy_doublerows = false; @@ -89,7 +92,8 @@ float autocvar_hud_panel_scoreboard_accuracy_showdelay_minpos = 0.75; bool autocvar_hud_panel_scoreboard_itemstats = true; bool autocvar_hud_panel_scoreboard_itemstats_doublerows = false; -bool autocvar_hud_panel_scoreboard_itemstats_filter = true; +int autocvar_hud_panel_scoreboard_itemstats_filter = 1; +int autocvar_hud_panel_scoreboard_itemstats_filter_mask = 12; float autocvar_hud_panel_scoreboard_itemstats_showdelay = 2.2; // slightly more delayed than accuracy float autocvar_hud_panel_scoreboard_itemstats_showdelay_minpos = 0.75; @@ -104,6 +108,8 @@ bool autocvar_hud_panel_scoreboard_playerid = false; string autocvar_hud_panel_scoreboard_playerid_prefix = "#"; string autocvar_hud_panel_scoreboard_playerid_suffix = " "; +float scoreboard_time; + // mode 0: returns translated label // mode 1: prints name and description of all the labels string Label_getInfo(string label, int mode) @@ -160,9 +166,345 @@ string Label_getInfo(string label, int mode) return label; } +bool scoreboard_ui_disabling; +void HUD_Scoreboard_UI_Disable() +{ + scoreboard_ui_disabling = true; + scoreboard_showscores = false; +} + +void HUD_Scoreboard_UI_Disable_Instantly() +{ + scoreboard_ui_disabling = false; + scoreboard_ui_enabled = 0; + scoreboard_selected_panel = 0; + scoreboard_selected_player = NULL; + scoreboard_selected_team = NULL; +} + +// mode: 0 normal, 1 team selection +void Scoreboard_UI_Enable(int mode) +{ + if (mode == 1) + { + if (scoreboard_ui_enabled == 2 || !teamplay || intermission) + return; + + // release player's pressed keys as they aren't released elsewhere + // in particular jump needs to be released as it may open the team selection + // (when server detects jump has been pressed it sends the command to open the team selection) + Release_Common_Keys(); + scoreboard_ui_enabled = 2; + scoreboard_selected_panel = SB_PANEL_SCOREBOARD; + } + else + { + if (scoreboard_ui_enabled == 1) + return; + scoreboard_ui_enabled = 1; + scoreboard_selected_panel = SB_PANEL_FIRST; + } + scoreboard_selected_player = NULL; + scoreboard_selected_team = NULL; + scoreboard_selected_panel_time = time; +} + +int rankings_start_column; +int rankings_rows = 0; +int rankings_columns = 0; +int rankings_cnt = 0; +float HUD_Scoreboard_InputEvent(float bInputType, float nPrimary, float nSecondary) +{ + string s; + + if(!scoreboard_ui_enabled || scoreboard_ui_disabling) + return false; + + if(bInputType == 3) + { + mousepos.x = nPrimary; + mousepos.y = nSecondary; + return true; + } + + if(bInputType == 2) + return false; + + // at this point bInputType can only be 0 or 1 (key pressed or released) + bool key_pressed = (bInputType == 0); + + // ESC to exit (TAB-ESC works too) + if(nPrimary == K_ESCAPE) + { + if (!key_pressed) + return true; + HUD_Scoreboard_UI_Disable(); + return true; + } + + // block any input while a menu dialog is fading + if(autocvar__menu_alpha) + { + hudShiftState = 0; + return true; + } + + // allow console bind to work + string con_keys = findkeysforcommand("toggleconsole", 0); + int keys = tokenize(con_keys); // findkeysforcommand returns data for this + + bool hit_con_bind = false; + int i; + for (i = 0; i < keys; ++i) + { + if(nPrimary == stof(argv(i))) + hit_con_bind = true; + } + + if(key_pressed) { + if(nPrimary == K_ALT) hudShiftState |= S_ALT; + if(nPrimary == K_CTRL) hudShiftState |= S_CTRL; + if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT; + if(nPrimary == K_TAB) hudShiftState |= S_TAB; + } + else { + if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT); + if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL); + if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT); + if(nPrimary == K_TAB) hudShiftState -= (hudShiftState & S_TAB); + } + + if(nPrimary == K_TAB) + { + if (!key_pressed) + return true; + if (scoreboard_ui_enabled == 2) + { + if (hudShiftState & S_SHIFT) + goto uparrow_action; + else + goto downarrow_action; + } + + if (hudShiftState & S_SHIFT) + { + --scoreboard_selected_panel; + if (scoreboard_selected_panel == SB_PANEL_RANKINGS && !rankings_cnt) + --scoreboard_selected_panel; + if (scoreboard_selected_panel < SB_PANEL_FIRST) + scoreboard_selected_panel = SB_PANEL_MAX; + } + else + { + ++scoreboard_selected_panel; + if (scoreboard_selected_panel == SB_PANEL_RANKINGS && !rankings_cnt) + ++scoreboard_selected_panel; + if (scoreboard_selected_panel > SB_PANEL_MAX) + scoreboard_selected_panel = SB_PANEL_FIRST; + } + + scoreboard_selected_panel_time = time; + } + else if(nPrimary == K_DOWNARROW) + { + if (!key_pressed) + return true; + LABEL(downarrow_action); + if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD) + { + if (scoreboard_ui_enabled == 2) + { + entity curr_team = NULL; + bool scoreboard_selected_team_found = false; + if (!scoreboard_selected_team) + scoreboard_selected_team_found = true; + + for(entity tm = teams.sort_next; tm; tm = tm.sort_next) + { + if(tm.team == NUM_SPECTATOR) + continue; + curr_team = tm; + if (scoreboard_selected_team_found) + goto ok_team; + if (scoreboard_selected_team == tm) + scoreboard_selected_team_found = true; + } + LABEL(ok_team); + if (curr_team == scoreboard_selected_team) // loop reached the last team + curr_team = NULL; + scoreboard_selected_team = curr_team; + } + else + { + entity pl, tm; + entity curr_pl = NULL; + bool scoreboard_selected_player_found = false; + if (!scoreboard_selected_player) + scoreboard_selected_player_found = true; + + for(tm = teams.sort_next; tm; tm = tm.sort_next) + { + if(tm.team != NUM_SPECTATOR) + for(pl = players.sort_next; pl; pl = pl.sort_next) + { + if(pl.team != tm.team) + continue; + curr_pl = pl; + if (scoreboard_selected_player_found) + goto ok_done; + if (scoreboard_selected_player == pl) + scoreboard_selected_player_found = true; + } + } + LABEL(ok_done); + if (curr_pl == scoreboard_selected_player) // loop reached the last player + curr_pl = NULL; + scoreboard_selected_player = curr_pl; + } + } + } + else if(nPrimary == K_UPARROW) + { + if (!key_pressed) + return true; + LABEL(uparrow_action); + if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD) + { + if (scoreboard_ui_enabled == 2) + { + entity prev_team = NULL; + for(entity tm = teams.sort_next; tm; tm = tm.sort_next) + { + if(tm.team == NUM_SPECTATOR) + continue; + if (tm == scoreboard_selected_team) + goto ok_team2; + prev_team = tm; + } + LABEL(ok_team2); + scoreboard_selected_team = prev_team; + } + else + { + entity prev_pl = NULL; + entity pl, tm; + for(tm = teams.sort_next; tm; tm = tm.sort_next) + { + if(tm.team != NUM_SPECTATOR) + for(pl = players.sort_next; pl; pl = pl.sort_next) + { + if(pl.team != tm.team) + continue; + if (pl == scoreboard_selected_player) + goto ok_done2; + prev_pl = pl; + } + } + LABEL(ok_done2); + scoreboard_selected_player = prev_pl; + } + } + } + else if(nPrimary == K_RIGHTARROW) + { + if (!key_pressed) + return true; + if (scoreboard_selected_panel == SB_PANEL_RANKINGS) + rankings_start_column = min(rankings_start_column + 1, (ceil(RANKINGS_RECEIVED_CNT / rankings_rows) - rankings_columns)); + } + else if(nPrimary == K_LEFTARROW) + { + if (!key_pressed) + return true; + if (scoreboard_selected_panel == SB_PANEL_RANKINGS) + rankings_start_column = max(rankings_start_column - 1, 0); + } + else if(nPrimary == K_ENTER || nPrimary == K_SPACE || nPrimary == K_KP_ENTER) + { + if (!key_pressed) + return true; + if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD) + { + if (scoreboard_ui_enabled == 2) + { + string team_name; + if (!scoreboard_selected_team || (hudShiftState & S_SHIFT)) + team_name = "auto"; + else + team_name = Static_Team_ColorName(scoreboard_selected_team.team); + localcmd(sprintf("cmd selectteam %s; cmd join\n", team_name)); + HUD_Scoreboard_UI_Disable(); + } + else if (!scoreboard_selected_player || (hudShiftState & S_SHIFT)) + { + localcmd("join\n"); + HUD_Scoreboard_UI_Disable(); + } + else + localcmd(sprintf("spectate %d\n", scoreboard_selected_player.sv_entnum + 1)); + } + } + else if(nPrimary == 'c' && (hudShiftState & S_CTRL)) + { + if (!key_pressed) + return true; + if (scoreboard_ui_enabled == 1 && scoreboard_selected_panel == SB_PANEL_SCOREBOARD) + { + switch (scoreboard_selected_columns_layout) + { + case 0: + if (autocvar_scoreboard_columns != "" && autocvar_scoreboard_columns != "all" && autocvar_scoreboard_columns != "default") + { + localcmd(sprintf("scoreboard_columns_set\n")); // sets the layout saved in scoreboard_columns + scoreboard_selected_columns_layout = 1; + break; + } + // fallthrough + case 1: + localcmd(sprintf("scoreboard_columns_set default\n")); + scoreboard_selected_columns_layout = 2; + break; + case 2: + localcmd(sprintf("scoreboard_columns_set all\n")); + scoreboard_selected_columns_layout = 0; + break; + } + } + } + else if(nPrimary == 't' && (hudShiftState & S_CTRL)) + { + if (!key_pressed) + return true; + if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD) + { + if (scoreboard_selected_player) + { + localcmd(sprintf("commandmode tell \"%s^7\"\n", entcs_GetName(scoreboard_selected_player.sv_entnum))); + HUD_Scoreboard_UI_Disable(); + } + } + } + else if(nPrimary == 'k' && (hudShiftState & S_CTRL)) + { + if (!key_pressed) + return true; + if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD) + { + if (scoreboard_selected_player) + localcmd(sprintf("vcall kick \"%s^7\"\n", entcs_GetName(scoreboard_selected_player.sv_entnum))); + } + } + else if(hit_con_bind || nPrimary == K_PAUSE) + return false; + + return true; +} + 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; @@ -175,6 +517,13 @@ void Scoreboard_InitScores() 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; @@ -196,6 +545,11 @@ void Scoreboard_InitScores() //float lastpnum; void Scoreboard_UpdatePlayerTeams() { + static float update_time; + if (time <= update_time) + return; + update_time = time; + entity pl, tmp; //int num = 0; for(pl = players.sort_next; pl; pl = pl.sort_next) @@ -238,14 +592,8 @@ int Scoreboard_CompareScore(int vl, int vr, int f) float Scoreboard_ComparePlayerScores(entity left, entity right) { - float vl, vr, r; - vl = entcs_GetTeam(left.sv_entnum); - vr = entcs_GetTeam(right.sv_entnum); - - if(!left.gotscores) - vl = NUM_SPECTATOR; - if(!right.gotscores) - vr = NUM_SPECTATOR; + int vl = (left.gotscores) ? entcs_GetTeam(left.sv_entnum) : NUM_SPECTATOR; + int vr = (right.gotscores) ? entcs_GetTeam(right.sv_entnum) : NUM_SPECTATOR; if(vl > vr) return true; @@ -261,18 +609,26 @@ float Scoreboard_ComparePlayerScores(entity left, entity right) 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; + int r; + 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; @@ -295,26 +651,29 @@ void Scoreboard_UpdatePlayerPos(entity player) float Scoreboard_CompareTeamScores(entity left, entity right) { - int i, r; - if(left.team == NUM_SPECTATOR) return 1; if(right.team == NUM_SPECTATOR) return 0; - r = Scoreboard_CompareScore(left.teamscores(ts_primary), right.teamscores(ts_primary), teamscores_flags(ts_primary)); - if (r >= 0) - return r; - - r = Scoreboard_CompareScore(left.teamscores(ts_secondary), right.teamscores(ts_secondary), teamscores_flags(ts_secondary)); - if (r >= 0) - return r; - - for(i = 0; i < MAX_TEAMSCORE; ++i) + int fld_idx = -1; + int r; + for(int i = -2; i < MAX_TEAMSCORE; ++i) { - r = Scoreboard_CompareScore(left.teamscores(i), right.teamscores(i), teamscores_flags(i)); - if (r >= 0) - return r; + if (i < 0) + { + if (fld_idx == -1) fld_idx = ts_primary; + else if (ts_secondary == ts_primary) continue; + else fld_idx = ts_secondary; + } + else + { + fld_idx = i; + if (fld_idx == ts_primary || fld_idx == ts_secondary) continue; + } + + r = Scoreboard_CompareScore(left.teamscores(fld_idx), right.teamscores(fld_idx), teamscores_flags(fld_idx)); + if (r >= 0) return r; } if (left.team < right.team) @@ -422,9 +781,16 @@ void Cmd_Scoreboard_SetFields(int argc) cvar_set("scoreboard_columns", SCOREBOARD_DEFAULT_COLUMNS); argc = tokenizebyseparator(strcat("0 1 ", SCOREBOARD_DEFAULT_COLUMNS), " "); } - else if(argv(2) == "all") + else if(argv(2) == "all" || argv(2) == "ALL") { - string s = "ping pl name |"; // scores without a label + string s = "ping pl name |"; // scores without label (not really scores) + if(argv(2) == "ALL") + { + // scores without label + s = strcat(s, " ", "sum"); + s = strcat(s, " ", "kdratio"); + s = strcat(s, " ", "frags"); + } FOREACH(Scores, true, { if(it != ps_primary) if(it != ps_secondary) @@ -463,25 +829,27 @@ void Cmd_Scoreboard_SetFields(int argc) 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; @@ -489,16 +857,15 @@ void Cmd_Scoreboard_SetFields(int argc) } }); -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; @@ -524,7 +891,7 @@ LABEL(found) { 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]; @@ -538,7 +905,7 @@ LABEL(found) 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]; @@ -870,7 +1237,12 @@ void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, i vector h_pos = item_pos; vector h_size = vec2(panel_size.x, hud_fontsize.y * 1.25); // alternated rows highlighting - if(is_self) + if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD && scoreboard_ui_enabled == 1) + { + if (pl == scoreboard_selected_player) + drawfill(h_pos, h_size, rgb, 0.44 * panel_fg_alpha, DRAWFLAG_NORMAL); + } + else if(is_self) drawfill(h_pos, h_size, rgb, sbt_highlight_alpha_self, DRAWFLAG_NORMAL); else if((sbt_highlight) && (!(pl_number % 2))) drawfill(h_pos, h_size, rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL); @@ -1039,6 +1411,16 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity } } + if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD && scoreboard_ui_enabled == 1) + { + if (pl == scoreboard_selected_player) + { + 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, rgb, 0.44 * panel_fg_alpha, DRAWFLAG_NORMAL); + } + } + vector name_pos = pos; if((this_team == NUM_SPECTATOR) && autocvar_hud_panel_scoreboard_spectators_aligned) name_pos.x += max(fieldsize, min_fieldsize) + 2 * fieldpadding + hud_fontsize.x * 0.25; @@ -1093,6 +1475,12 @@ vector Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) panel_pos = pos; panel_size.y = 1.25 * hud_fontsize.y * (1 + bound(1, tm.team_size, max_players)); panel_size.y += panel_bg_padding * 2; + + vector scoreboard_selected_hl_pos = pos; + vector scoreboard_selected_hl_size = '0 0 0'; + scoreboard_selected_hl_size.x = scoreboard_right - scoreboard_left; + scoreboard_selected_hl_size.y = panel_size.y; + HUD_Panel_DrawBg(); vector end_pos = panel_pos + eY * (panel_size.y + 0.5 * hud_fontsize.y); @@ -1154,13 +1542,39 @@ vector Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) ++i; } + if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD) + { + if (scoreboard_ui_enabled == 1 || (tm && scoreboard_selected_team == tm)) + { + float _alpha = (scoreboard_ui_enabled == 2) ? 0.2 : 0.3 * max(0, (1 - (time - scoreboard_selected_panel_time) * 2)); + _alpha *= panel_fg_alpha; + if (_alpha) + drawfill(scoreboard_selected_hl_pos, scoreboard_selected_hl_size, '1 1 1', _alpha, DRAWFLAG_NORMAL); + } + } + panel_size.x += panel_bg_padding * 2; // restore initial width return end_pos; } bool Scoreboard_WouldDraw() { - if (MUTATOR_CALLHOOK(DrawScoreboard)) + if (scoreboard_ui_enabled) + { + if (scoreboard_ui_disabling) + { + if (scoreboard_fade_alpha == 0) + HUD_Scoreboard_UI_Disable_Instantly(); + return false; + } + if (intermission && scoreboard_ui_enabled == 2) + { + HUD_Scoreboard_UI_Disable_Instantly(); + return false; + } + return true; + } + else if (MUTATOR_CALLHOOK(DrawScoreboard)) return false; else if (QuickMenu_IsOpened()) return false; @@ -1215,10 +1629,11 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) int rows = 1; if (autocvar_hud_panel_scoreboard_accuracy_doublerows && weapon_cnt >= floor((REGISTRY_COUNT(Weapons) - nHidden - 1) * 0.5)) rows = 2; - int columnns = ceil(weapon_cnt / rows); + int columns = ceil(weapon_cnt / rows); - float weapon_height = 29; - float height = hud_fontsize.y + weapon_height; + float aspect = max(0.001, autocvar_hud_panel_weapons_aspect); + float weapon_height = hud_fontsize.y * 2.3 / aspect; + float height = weapon_height + hud_fontsize.y; drawstring(pos + eX * panel_bg_padding, sprintf(_("Accuracy stats (average %d%%)"), average_accuracy), hud_fontsize, '1 1 1', panel_fg_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; @@ -1247,7 +1662,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) pos = panel_pos; vector tmp = panel_size; - float weapon_width = tmp.x / columnns / rows; + float weapon_width = tmp.x / columns / rows; if (sbt_bg_alpha) drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); @@ -1255,7 +1670,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) if(sbt_highlight) { // column highlighting - for (int i = 0; i < columnns; ++i) + for (int i = 0; i < columns; ++i) if ((i % 2) == 0) drawfill(pos + eX * weapon_width * rows * i, vec2(weapon_width * rows, height * rows), '0 0 0', sbt_highlight_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); @@ -1300,11 +1715,8 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) weapons_with_stats += 1; average_accuracy += weapon_stats; // store sum of all accuracies in average_accuracy - string s; - s = sprintf("%d%%", weapon_stats * 100); - - float padding; - padding = (weapon_width - stringwidth(s, false, hud_fontsize)) / 2; // center the accuracy value + string s = sprintf("%d%%", weapon_stats * 100); + float padding = (weapon_width - stringwidth(s, false, hud_fontsize)) / 2; if(!autocvar_hud_panel_scoreboard_accuracy_nocolors) rgb = Accuracy_GetColor(weapon_stats); @@ -1313,7 +1725,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) } tmpos.x += weapon_width * rows; pos.x += weapon_width * rows; - if (rows == 2 && column == columnns - 1) { + if (rows == 2 && column == columns - 1) { tmpos.x = oldposx; tmpos.y += height; pos.y += height; @@ -1329,18 +1741,31 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) return end_pos; } -.bool uninteresting; -STATIC_INIT(default_order_items_label) +bool is_item_filtered(entity it) { - IL_EACH(default_order_items, true, { - if(!(it.instanceOfPowerup - || it == ITEM_HealthMega || it == ITEM_HealthBig - || it == ITEM_ArmorMega || it == ITEM_ArmorBig - )) + if (!autocvar_hud_panel_scoreboard_itemstats_filter) + return false; + int mask = autocvar_hud_panel_scoreboard_itemstats_filter_mask; + if (mask <= 0) + return false; + if (it.instanceOfArmor || it.instanceOfHealth) + { + int ha_mask = floor(mask) % 10; + switch (ha_mask) { - it.uninteresting = true; + default: return false; + case 4: if (it == ITEM_HealthMega || it == ITEM_ArmorMega) return true; // else fallthrough + case 3: if (it == ITEM_HealthBig || it == ITEM_ArmorBig) return true; // else fallthrough + case 2: if (it == ITEM_HealthMedium || it == ITEM_ArmorMedium) return true; // else fallthrough + case 1: if (it == ITEM_HealthSmall || it == ITEM_ArmorSmall) return true; // else fallthrough } - }); + } + if (it.instanceOfAmmo) + { + int ammo_mask = floor(mask / 10) % 10; + return (ammo_mask == 1); + } + return false; } vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) @@ -1352,7 +1777,7 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) IL_EACH(default_order_items, true, { int q = g_inventory.inv_items[it.m_id]; //q = 1; // debug: display all items - if (autocvar_hud_panel_scoreboard_itemstats_filter && it.uninteresting) + if (is_item_filtered(it)) ++uninteresting_cnt; else if (!q) ++disowned_cnt; @@ -1362,11 +1787,10 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) if (n <= 0) return pos; int rows = (autocvar_hud_panel_scoreboard_itemstats_doublerows && n >= floor(REGISTRY_COUNT(Items) / 2)) ? 2 : 1; - int columnns = max(6, ceil(n / rows)); + int columns = max(6, ceil(n / rows)); - float height = 40; - float fontsize = height * 1/3; - float item_height = height * 2/3; + float item_height = hud_fontsize.y * 2.3; + float height = item_height + hud_fontsize.y; drawstring(pos + eX * panel_bg_padding, _("Item stats"), hud_fontsize, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; @@ -1395,7 +1819,7 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) pos = panel_pos; vector tmp = panel_size; - float item_width = tmp.x / columnns / rows; + float item_width = tmp.x / columns / rows; if (sbt_bg_alpha) drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); @@ -1403,13 +1827,13 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) if(sbt_highlight) { // column highlighting - for (int i = 0; i < columnns; ++i) + for (int i = 0; i < columns; ++i) if ((i % 2) == 0) - drawfill(pos + '1 0 0' * item_width * rows * i, '0 1 0' * height * rows + '1 0 0' * item_width * rows, '0 0 0', sbt_highlight_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); + drawfill(pos + eX * item_width * rows * i, vec2(item_width * rows, height * rows), '0 0 0', sbt_highlight_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); // row highlighting for (int i = 0; i < rows; ++i) - drawfill(pos + '0 1 0' * item_height + '0 1 0' * height * i, '1 0 0' * panel_size.x + '0 1 0' * fontsize, rgb, sbt_highlight_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); + drawfill(pos + eY * (item_height + height * i), vec2(panel_size.x, hud_fontsize.y), rgb, sbt_highlight_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); } if (rows == 2) @@ -1419,17 +1843,17 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) vector tmpos = pos; int column = 0; - IL_EACH(default_order_items, !(autocvar_hud_panel_scoreboard_itemstats_filter && it.uninteresting), { + IL_EACH(default_order_items, !is_item_filtered(it), { int n = g_inventory.inv_items[it.m_id]; //n = 1 + floor(i * 3 + 4.8) % 7; // debug: display a value for each item if (n <= 0) continue; - drawpic_aspect_skin(tmpos, it.m_icon, '1 0 0' * item_width + '0 1 0' * item_height, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(tmpos, it.m_icon, eX * item_width + eY * item_height, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); string s = ftos(n); - float padding = (item_width - stringwidth(s, false, '1 0 0' * fontsize)) / 2; // center - drawstring(tmpos + '1 0 0' * padding + '0 1 0' * item_height, s, '1 1 0' * fontsize, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); + float padding = (item_width - stringwidth(s, false, hud_fontsize)) / 2; + drawstring(tmpos + vec2(padding, item_height), s, hud_fontsize, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); tmpos.x += item_width * rows; pos.x += item_width * rows; - if (rows == 2 && column == columnns - 1) { + if (rows == 2 && column == columns - 1) { tmpos.x = oldposx; tmpos.y += height; pos.y += height; @@ -1523,7 +1947,6 @@ vector Scoreboard_MapStats_Draw(vector pos, vector rgb, vector bg_size) { return end_pos; } - vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector rgb, vector bg_size) { int i; @@ -1537,12 +1960,17 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector vector hl_rgb = rgb + '0.5 0.5 0.5'; - pos.y += hud_fontsize.y; + vector scoreboard_selected_hl_pos = pos; + drawstring(pos + eX * panel_bg_padding, ranktitle, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; if(panel.current_panel_bg != "0") pos.y += panel_bg_border; + vector scoreboard_selected_hl_size = '0 0 0'; + scoreboard_selected_hl_size.x = scoreboard_right - scoreboard_left; + scoreboard_selected_hl_size.y = pos.y - scoreboard_selected_hl_pos.y; + panel_pos = pos; float namesize = 0; @@ -1562,16 +1990,22 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector float ranksize = 3 * hud_fontsize.x; float timesize = 5 * hud_fontsize.x; vector columnsize = vec2(ranksize + timesize + namesize + hud_fontsize.x, 1.25 * hud_fontsize.y); - int columns = max(1, floor((panel_size.x - 2 * panel_bg_padding) / columnsize.x)); - columns = min(columns, RANKINGS_RECEIVED_CNT); + rankings_columns = max(1, floor((panel_size.x - 2 * panel_bg_padding) / columnsize.x)); + rankings_columns = min(rankings_columns, RANKINGS_RECEIVED_CNT); + if (!rankings_cnt) + { + rankings_cnt = RANKINGS_RECEIVED_CNT; + rankings_rows = ceil(rankings_cnt / rankings_columns); + } // expand name column to fill the entire row - float available_space = (panel_size.x - 2 * panel_bg_padding - columnsize.x * columns) / columns; + float available_space = (panel_size.x - 2 * panel_bg_padding - columnsize.x * rankings_columns) / rankings_columns; namesize += available_space; columnsize.x += available_space; - panel_size.y = ceil(RANKINGS_RECEIVED_CNT / columns) * 1.25 * hud_fontsize.y; + panel_size.y = rankings_rows * 1.25 * hud_fontsize.y; panel_size.y += panel_bg_padding * 2; + scoreboard_selected_hl_size.y += panel_size.y; HUD_Panel_DrawBg(); @@ -1594,16 +2028,16 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector string str = ""; int column = 0, j = 0; string zoned_name_self = strzone(strdecolorize(entcs_GetName(player_localnum))); - for(i = 0; i < RANKINGS_RECEIVED_CNT; ++i) + int start_item = rankings_start_column * rankings_rows; + for(i = start_item; i < start_item + rankings_cnt; ++i) { - float t; - t = grecordtime[i]; + int t = grecordtime[i]; if (t == 0) continue; if(strdecolorize(grecordholder[i]) == zoned_name_self) drawfill(pos, columnsize, hl_rgb, sbt_highlight_alpha_self, DRAWFLAG_NORMAL); - else if(!((j + column) & 1) && sbt_highlight) + else if(!((j + rankings_start_column + column) & 1) && sbt_highlight) drawfill(pos, columnsize, hl_rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL); str = count_ordinal(i+1); @@ -1616,21 +2050,26 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector pos.y += 1.25 * hud_fontsize.y; j++; - if(j >= ceil(RANKINGS_RECEIVED_CNT / columns)) + if(j >= rankings_rows) { column++; j = 0; - pos.x += panel_size.x / columns; + pos.x += panel_size.x / rankings_columns; pos.y = panel_pos.y; } } strfree(zoned_name_self); + if (scoreboard_selected_panel == SB_PANEL_RANKINGS) + { + float fade = max(0, (1 - (time - scoreboard_selected_panel_time) * 2)); + drawfill(scoreboard_selected_hl_pos, scoreboard_selected_hl_size, '1 1 1', fade * 0.44, DRAWFLAG_NORMAL); + } + panel_size.x += panel_bg_padding * 2; // restore initial width return end_pos; } -float scoreboard_time; bool have_weapon_stats; bool Scoreboard_AccuracyStats_WouldDraw(float ypos) { @@ -1681,7 +2120,7 @@ bool Scoreboard_ItemStats_WouldDraw(float ypos) if (!have_item_stats) { IL_EACH(default_order_items, true, { - if (!(autocvar_hud_panel_scoreboard_itemstats_filter && it.uninteresting)) + if (!is_item_filtered(it)) { int q = g_inventory.inv_items[it.m_id]; //q = 1; // debug: display all items @@ -1699,6 +2138,36 @@ bool Scoreboard_ItemStats_WouldDraw(float ypos) return true; } +vector Scoreboard_Spectators_Draw(vector pos) { + + entity pl, tm; + string str = ""; + + for(pl = players.sort_next; pl; pl = pl.sort_next) + { + if(pl.team == NUM_SPECTATOR) + { + for(tm = teams.sort_next; tm; tm = tm.sort_next) + if(tm.team == NUM_SPECTATOR) + break; + str = sprintf("%s (%d)", _("Spectators"), tm.team_size); + draw_beginBoldFont(); + drawstring(pos, str, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + draw_endBoldFont(); + pos.y += 1.25 * hud_fontsize.y; + + pos = Scoreboard_DrawOthers(pos, '0 0 0', pl.team, NULL, pl, 0); + pos.y += 1.25 * hud_fontsize.y; + + break; + } + } + if (str != "") // if there's at least one spectator + pos.y += 0.5 * hud_fontsize.y; + + return pos; +} + void Scoreboard_Draw() { if(!autocvar__hud_configure) @@ -1765,14 +2234,16 @@ void Scoreboard_Draw() float excess = max(0, max_namesize - autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x); float fixed_scoreboard_width = bound(vid_conwidth * autocvar_hud_panel_scoreboard_minwidth, vid_conwidth - excess, vid_conwidth * 0.93); - panel_pos.x = 0.5 * (vid_conwidth - fixed_scoreboard_width); + scoreboard_left = 0.5 * (vid_conwidth - fixed_scoreboard_width); + scoreboard_right = scoreboard_left + fixed_scoreboard_width; + panel_pos.x = scoreboard_left; panel_size.x = fixed_scoreboard_width; Scoreboard_UpdatePlayerTeams(); - float initial_pos_y = panel_pos.y; + scoreboard_top = panel_pos.y; vector pos = panel_pos; - entity pl, tm; + entity tm; string str; vector str_pos; @@ -1783,73 +2254,90 @@ void Scoreboard_Draw() sb_gameinfo_detail_fontsize = hud_fontsize * 1.3; // Game Info: Game Type - str = MapInfo_Type_ToText(gametype); + if (scoreboard_ui_enabled == 2) + str = _("Team Selection"); + else + str = MapInfo_Type_ToText(gametype); draw_beginBoldFont(); drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_type_fontsize)), str, sb_gameinfo_type_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); draw_endBoldFont(); + pos.y += sb_gameinfo_type_fontsize.y; // Game Info: Game Detail - float tl = STAT(TIMELIMIT); - float fl = STAT(FRAGLIMIT); - float ll = STAT(LEADLIMIT); - float ll_and_fl = STAT(LEADLIMIT_AND_FRAGLIMIT); - str = ""; - if(tl > 0) - str = strcat(str, sprintf(_("^3%1.0f minutes"), tl)); - if(!gametype.m_hidelimits) - { - if(fl > 0) - { - if(tl > 0) - str = strcat(str, "^7 / "); // delimiter - if(teamplay) - { - str = strcat(str, sprintf(_("^5%s %s"), ScoreString(teamscores_flags(ts_primary), fl), - (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) : - (teamscores_label(ts_primary) == "fastest") ? "" : - TranslateScoresLabel(teamscores_label(ts_primary)))); - } - else - { - str = strcat(str, sprintf(_("^5%s %s"), ScoreString(scores_flags(ps_primary), fl), - (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) : - (scores_label(ps_primary) == "fastest") ? "" : - TranslateScoresLabel(scores_label(ps_primary)))); - } - } - if(ll > 0) + if (scoreboard_ui_enabled == 2) + { + if (scoreboard_selected_team) + str = sprintf(_("^7Press ^3%s^7 to join the selected team"), getcommandkey(_("jump"), "+jump")); + else + str = sprintf(_("^7Press ^3%s^7 to auto-select a team and join"), getcommandkey(_("jump"), "+jump")); + drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + + pos.y += sb_gameinfo_detail_fontsize.y + hud_fontsize.y * 0.3; + str = sprintf(_("^7Press ^3%s ^7to select a specific team"), translate_key("TAB")); + drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + } + else + { + float tl = STAT(TIMELIMIT); + float fl = STAT(FRAGLIMIT); + float ll = STAT(LEADLIMIT); + float ll_and_fl = STAT(LEADLIMIT_AND_FRAGLIMIT); + str = ""; + if(tl > 0) + str = strcat(str, sprintf(_("^3%1.0f minutes"), tl)); + if(!gametype.m_hidelimits) { - if(tl > 0 || fl > 0) + if(fl > 0) { - // delimiter - if (ll_and_fl && fl > 0) - str = strcat(str, "^7 & "); + if(tl > 0) + str = strcat(str, "^7 / "); // delimiter + if(teamplay) + { + str = strcat(str, sprintf(_("^5%s %s"), ScoreString(teamscores_flags(ts_primary), fl), + (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) : + (teamscores_label(ts_primary) == "fastest") ? "" : + TranslateScoresLabel(teamscores_label(ts_primary)))); + } else - str = strcat(str, "^7 / "); - } - - if(teamplay) - { - str = strcat(str, sprintf(_("^2+%s %s"), ScoreString(teamscores_flags(ts_primary), ll), - (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) : - (teamscores_label(ts_primary) == "fastest") ? "" : - TranslateScoresLabel(teamscores_label(ts_primary)))); + { + str = strcat(str, sprintf(_("^5%s %s"), ScoreString(scores_flags(ps_primary), fl), + (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) : + (scores_label(ps_primary) == "fastest") ? "" : + TranslateScoresLabel(scores_label(ps_primary)))); + } } - else + if(ll > 0) { - str = strcat(str, sprintf(_("^2+%s %s"), ScoreString(scores_flags(ps_primary), ll), - (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) : - (scores_label(ps_primary) == "fastest") ? "" : - TranslateScoresLabel(scores_label(ps_primary)))); + if(tl > 0 || fl > 0) + { + // delimiter + if (ll_and_fl && fl > 0) + str = strcat(str, "^7 & "); + else + str = strcat(str, "^7 / "); + } + + if(teamplay) + { + str = strcat(str, sprintf(_("^2+%s %s"), ScoreString(teamscores_flags(ts_primary), ll), + (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) : + (teamscores_label(ts_primary) == "fastest") ? "" : + TranslateScoresLabel(teamscores_label(ts_primary)))); + } + else + { + str = strcat(str, sprintf(_("^2+%s %s"), ScoreString(scores_flags(ps_primary), ll), + (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) : + (scores_label(ps_primary) == "fastest") ? "" : + TranslateScoresLabel(scores_label(ps_primary)))); + } } } + drawcolorcodedstring(pos + '1 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // align right + // map name + str = sprintf(_("^7Map: ^2%s"), shortmapname); + drawcolorcodedstring(pos, str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // align left } - - pos.y += sb_gameinfo_type_fontsize.y; - drawcolorcodedstring(pos + '1 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // align right - // map name - str = sprintf(_("^7Map: ^2%s"), shortmapname); - drawcolorcodedstring(pos, str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // align left // End of Game Info Section pos.y += sb_gameinfo_detail_fontsize.y + hud_fontsize.y * 0.3; // space between Game Info Section and score table @@ -1982,45 +2470,56 @@ void Scoreboard_Draw() pos = Scoreboard_MakeTable(pos, tm, panel_bg_color, bg_size); } + // draw scoreboard spectators before accuracy and item stats + if (autocvar_hud_panel_scoreboard_spectators_position == 0) { + pos = Scoreboard_Spectators_Draw(pos); + } + + // draw accuracy and item stats if (Scoreboard_AccuracyStats_WouldDraw(pos.y)) pos = Scoreboard_AccuracyStats_Draw(pos, panel_bg_color, bg_size); if (Scoreboard_ItemStats_WouldDraw(pos.y)) pos = Scoreboard_ItemStats_Draw(pos, panel_bg_color, bg_size); + // draw scoreboard spectators after accuracy and item stats and before rankings + if (autocvar_hud_panel_scoreboard_spectators_position == 1) { + pos = Scoreboard_Spectators_Draw(pos); + } + if(MUTATOR_CALLHOOK(ShowRankings)) { string ranktitle = M_ARGV(0, string); - if(race_speedaward) { - drawcolorcodedstring(pos, sprintf(_("Speed award: %d%s ^7(%s^7)"), race_speedaward, race_speedaward_unit, ColorTranslateRGB(race_speedaward_holder)), hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - pos.y += 1.25 * hud_fontsize.y; - } - if(race_speedaward_alltimebest) { - drawcolorcodedstring(pos, sprintf(_("All-time fastest: %d%s ^7(%s^7)"), race_speedaward_alltimebest, race_speedaward_alltimebest_unit, ColorTranslateRGB(race_speedaward_alltimebest_holder)), hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - pos.y += 1.25 * hud_fontsize.y; + string unit = GetSpeedUnit(autocvar_hud_panel_physics_speed_unit); + if(race_speedaward_alltimebest) + { + string name; + float namesize = autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x; + str = ""; + if(race_speedaward) + { + name = textShortenToWidth(ColorTranslateRGB(race_speedaward_holder), namesize, hud_fontsize, stringwidth_colors); + str = sprintf(_("Speed award: %d%s ^7(%s^7)"), race_speedaward, unit, name); + str = strcat(str, " / "); + } + name = textShortenToWidth(ColorTranslateRGB(race_speedaward_alltimebest_holder), namesize, hud_fontsize, stringwidth_colors); + str = strcat(str, sprintf(_("All-time fastest: %d%s ^7(%s^7)"), race_speedaward_alltimebest, unit, name)); + drawcolorcodedstring(pos, str, hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + pos.y += 1.25 * hud_fontsize.y; // line height + line spacing } pos = Scoreboard_Rankings_Draw(pos, ranktitle, playerslots[player_localnum], panel_bg_color, bg_size); } + else + rankings_cnt = 0; - pos = Scoreboard_MapStats_Draw(pos, panel_bg_color, bg_size); - - // List spectators - for(pl = players.sort_next; pl; pl = pl.sort_next) - { - if(pl.team == NUM_SPECTATOR) - { - for(tm = teams.sort_next; tm; tm = tm.sort_next) - if(tm.team == NUM_SPECTATOR) - break; - str = sprintf("%s (%d)", _("Spectators"), tm.team_size); - draw_beginBoldFont(); - drawstring(pos, str, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - draw_endBoldFont(); - pos.y += 1.25 * hud_fontsize.y; + // draw scoreboard spectators after rankings + if (autocvar_hud_panel_scoreboard_spectators_position == 2) { + pos = Scoreboard_Spectators_Draw(pos); + } - pos = Scoreboard_DrawOthers(pos, '0 0 0', pl.team, NULL, pl, 0); - pos.y += 1.25 * hud_fontsize.y; + pos = Scoreboard_MapStats_Draw(pos, panel_bg_color, bg_size); - break; - } + // draw scoreboard spectators after mapstats + if (autocvar_hud_panel_scoreboard_spectators_position == 3) { + pos = Scoreboard_Spectators_Draw(pos); } @@ -2062,14 +2561,26 @@ void Scoreboard_Draw() drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, hud_fontsize)), str, hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); } - pos.y += 2 * hud_fontsize.y; + pos.y += hud_fontsize.y; if (scoreboard_fade_alpha < 1) - scoreboard_bottom = initial_pos_y + (pos.y - initial_pos_y) * scoreboard_fade_alpha; + scoreboard_bottom = scoreboard_top + (pos.y - scoreboard_top) * scoreboard_fade_alpha; else if (pos.y != scoreboard_bottom) { if (pos.y > scoreboard_bottom) - scoreboard_bottom = min(pos.y, scoreboard_bottom + frametime * 10 * (pos.y - initial_pos_y)); + scoreboard_bottom = min(pos.y, scoreboard_bottom + frametime * 10 * (pos.y - scoreboard_top)); else - scoreboard_bottom = max(pos.y, scoreboard_bottom - frametime * 10 * (pos.y - initial_pos_y)); + scoreboard_bottom = max(pos.y, scoreboard_bottom - frametime * 10 * (pos.y - scoreboard_top)); + } + + if (rankings_cnt) + { + if (scoreboard_fade_alpha == 1) + { + if (scoreboard_bottom > 0.95 * vid_conheight) + rankings_rows = max(1, rankings_rows - 1); + else if (scoreboard_bottom + 1.25 * hud_fontsize.y < 0.95 * vid_conheight) + rankings_rows = min(ceil(RANKINGS_RECEIVED_CNT / rankings_columns), rankings_rows + 1); + } + rankings_cnt = rankings_rows * rankings_columns; } }