X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fscoreboard.qc;h=ef68e21b2000808fb0a8cec871bb86abda43ea39;hb=b0a563c3658ec620ddb9037b9417b743a47002a5;hp=d546c19eb292d0e2e453272e47180b4f268ff925;hpb=d95154e1c0e178a63502bd40de6ee4786151caff;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index d546c19eb..ef68e21b2 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -3,6 +3,7 @@ #include "quickmenu.qh" #include #include +#include #include #include #include @@ -58,9 +59,11 @@ bool autocvar_hud_panel_scoreboard_accuracy_nocolors = false; bool autocvar_hud_panel_scoreboard_dynamichud = false; -bool autocvar_hud_panel_scoreboard_maxheight = 0.5; +float autocvar_hud_panel_scoreboard_maxheight = 0.5; bool autocvar_hud_panel_scoreboard_others_showscore = true; bool autocvar_hud_panel_scoreboard_spectators_showping = true; +bool autocvar_hud_panel_scoreboard_spectators_aligned = false; +float autocvar_hud_panel_scoreboard_minwidth = 0.4; void drawstringright(vector, string, vector, vector, float, float); @@ -147,12 +150,10 @@ void Scoreboard_UpdatePlayerTeams() { float Team; entity pl, tmp; - float num; - - num = 0; + //int num = 0; for(pl = players.sort_next; pl; pl = pl.sort_next) { - num += 1; + //num += 1; Team = entcs_GetScoreTeam(pl.sv_entnum); if(SetTeam(pl, Team)) { @@ -372,8 +373,8 @@ void Cmd_Scoreboard_SetFields(int argc) TC(int, argc); int i, slash; string str, pattern; - float have_name = 0, have_primary = 0, have_secondary = 0, have_separator = 0; - float missing; + bool have_name = false, have_primary = false, have_secondary = false, have_separator = false; + int missing; if(!gametype) return; // do nothing, we don't know gametype and scores yet @@ -476,9 +477,9 @@ LABEL(notfound) LABEL(found) sbt_field[sbt_num_fields] = j; if(j == ps_primary) - have_primary = 1; + have_primary = true; if(j == ps_secondary) - have_secondary = 1; + have_secondary = true; } } @@ -488,11 +489,11 @@ LABEL(found) } if(scores_flags(ps_primary) & SFL_ALLOW_HIDE) - have_primary = 1; + have_primary = true; if(scores_flags(ps_secondary) & SFL_ALLOW_HIDE) - have_secondary = 1; + have_secondary = true; if(ps_primary == ps_secondary) - have_secondary = 1; + have_secondary = true; missing = (!have_primary) + (!have_secondary) + (!have_separator) + (!have_name); if(sbt_num_fields + missing < MAX_SBT_FIELDS) @@ -757,7 +758,10 @@ string Scoreboard_FixColumnWidth(int i, string str) void Scoreboard_initFieldSizes() { for(int i = 0; i < sbt_num_fields; ++i) + { + sbt_field_size[i] = stringwidth(sbt_field_title[i], false, hud_fontsize); Scoreboard_FixColumnWidth(i, ""); + } } vector Scoreboard_DrawHeader(vector pos, vector rgb, bool other_players) @@ -921,8 +925,18 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity if(!complete) width_limit -= stringwidth("...", false, hud_fontsize); float namesize = autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x; - float ping_padding = 0; - float min_pingsize = stringwidth("999", false, hud_fontsize); + static float max_name_width = 0; + string field = ""; + float fieldsize = 0; + float min_fieldsize = 0; + float fieldpadding = hud_fontsize.x * 0.25; + if(this_team == NUM_SPECTATOR) + { + if(autocvar_hud_panel_scoreboard_spectators_showping) + min_fieldsize = stringwidth("999", false, hud_fontsize); + } + else if(autocvar_hud_panel_scoreboard_others_showscore) + min_fieldsize = stringwidth("99", false, hud_fontsize); for(i = 0; pl; pl = pl.sort_next) { if(pl.team != this_team) @@ -930,24 +944,30 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity if(pl == ignored_pl) continue; - ping_padding = 0; - string str = textShortenToWidth(entcs_GetName(pl.sv_entnum), namesize, hud_fontsize, stringwidth_colors); + field = ""; if(this_team == NUM_SPECTATOR) { if(autocvar_hud_panel_scoreboard_spectators_showping) - { - string ping = Scoreboard_GetField(pl, SP_PING); - float pingsize = stringwidth(ping, false, hud_fontsize); - if(min_pingsize > pingsize) - ping_padding = min_pingsize - pingsize; - string col = rgb_to_hexcolor(sbt_field_rgb); - str = sprintf("%s ^7[%s%s^7]", str, col, ping); - } + field = Scoreboard_GetField(pl, SP_PING); } else if(autocvar_hud_panel_scoreboard_others_showscore) - str = sprintf("%s ^7(^3%s^7)", str, ftos(pl.(scores(ps_primary)))); - float str_width = stringwidth(str, true, hud_fontsize); - if(pos.x + str_width > width_limit) + field = ftos(pl.(scores(ps_primary))); + + string str = textShortenToWidth(entcs_GetName(pl.sv_entnum), namesize, hud_fontsize, stringwidth_colors); + float column_width = stringwidth(str, true, hud_fontsize); + if((this_team == NUM_SPECTATOR) && autocvar_hud_panel_scoreboard_spectators_aligned) + { + if(column_width > max_name_width) + max_name_width = column_width; + column_width = max_name_width; + } + if(field != "") + { + fieldsize = stringwidth(field, false, hud_fontsize); + column_width += hud_fontsize.x * 0.25 + max(fieldsize, min_fieldsize) + 2 * fieldpadding; + } + + if(pos.x + column_width > width_limit) { ++i; if(!complete) @@ -958,12 +978,28 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity else { pos.x = item_pos.x + hud_fontsize.x * 0.5; - pos.y = item_pos.y + i * (hud_fontsize.y * 1.25); + pos.y += hud_fontsize.y * 1.25; } } - drawcolorcodedstring(pos, str, hud_fontsize, sbt_fg_alpha, DRAWFLAG_NORMAL); - pos.x += str_width + hud_fontsize.x * 0.5; - pos.x += ping_padding; + + 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; + drawcolorcodedstring(name_pos, str, hud_fontsize, sbt_fg_alpha, DRAWFLAG_NORMAL); + if(field != "") + { + h_size.x = max(fieldsize, min_fieldsize) + 2 * fieldpadding; + h_size.y = hud_fontsize.y; + vector field_pos = pos; + if(!((this_team == NUM_SPECTATOR) && autocvar_hud_panel_scoreboard_spectators_aligned)) + field_pos.x += column_width - h_size.x; + if(sbt_highlight) + drawfill(field_pos, h_size, '1 1 1', sbt_highlight_alpha, DRAWFLAG_NORMAL); + field_pos.x += fieldpadding + (max(fieldsize, min_fieldsize) - fieldsize) * 0.5; + drawstring(field_pos, field, hud_fontsize, sbt_field_rgb, sbt_fg_alpha, DRAWFLAG_NORMAL); + } + pos.x += column_width; + pos.x += hud_fontsize.x; } return eX * item_pos.x + eY * (item_pos.y + i * hud_fontsize.y * 1.25); } @@ -1053,22 +1089,25 @@ vector Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) return end_pos; } -float Scoreboard_WouldDraw() { - if (QuickMenu_IsOpened()) - return 0; +bool Scoreboard_WouldDraw() +{ + if (MUTATOR_CALLHOOK(DrawScoreboard)) + return false; + else if (QuickMenu_IsOpened()) + return false; else if (HUD_Radar_Clickable()) - return 0; + return false; else if (scoreboard_showscores) - return 1; + return true; else if (intermission == 1) - return 1; + return true; else if (intermission == 2) - return 0; + return false; else if (spectatee_status != -1 && STAT(HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != MAPINFO_TYPE_CTS && !active_minigame) - return 1; + return true; else if (scoreboard_showscores_force) - return 1; - return 0; + return true; + return false; } float average_accuracy; @@ -1306,8 +1345,35 @@ vector Scoreboard_Rankings_Draw(vector pos, entity pl, vector rgb, vector bg_siz pos.y += panel_bg_border; panel_pos = pos; - panel_size.y = 1.25 * hud_fontsize.y * RANKINGS_RECEIVED_CNT; + + float namesize = 0; + for(i = 0; i < RANKINGS_RECEIVED_CNT; ++i) + { + float f = stringwidth(grecordholder[i], true, hud_fontsize); + if(f > namesize) + namesize = f; + } + bool cut = false; + if(namesize > autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x) + { + namesize = autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x; + cut = true; + } + + float ranksize = 3 * hud_fontsize.x; + float timesize = 5 * hud_fontsize.x; + vector columnsize = eX * (ranksize + timesize + namesize + hud_fontsize.x) + eY * 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); + + // expand name column to fill the entire row + float available_space = (panel_size.x - 2 * panel_bg_padding - columnsize.x * columns) / columns; + namesize += available_space; + columnsize.x += available_space; + + panel_size.y = ceil(RANKINGS_RECEIVED_CNT / columns) * 1.25 * hud_fontsize.y; panel_size.y += panel_bg_padding * 2; + HUD_Panel_DrawBg(); vector end_pos = panel_pos + eY * (panel_size.y + hud_fontsize.y); @@ -1321,29 +1387,42 @@ vector Scoreboard_Rankings_Draw(vector pos, entity pl, vector rgb, vector bg_siz } pos = panel_pos; - vector tmp = panel_size; if (sbt_bg_alpha) - drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha, DRAWFLAG_NORMAL); + drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, panel_size, rgb, sbt_bg_alpha, DRAWFLAG_NORMAL); - // row highlighting + vector text_ofs = eX * 0.5 * hud_fontsize.x + eY * (1.25 - 1) / 2 * hud_fontsize.y; // center text vertically + string str = ""; + int column = 0, j = 0; for(i = 0; i < RANKINGS_RECEIVED_CNT; ++i) { - string n, p; float t; t = grecordtime[i]; if (t == 0) continue; - n = grecordholder[i]; - p = count_ordinal(i+1); + if(grecordholder[i] == entcs_GetName(player_localnum)) - drawfill(pos, eX * panel_size.x + '0 1.25 0' * hud_fontsize.y, hl_rgb, sbt_highlight_alpha_self, DRAWFLAG_NORMAL); - else if(!(i % 2) && sbt_highlight) - drawfill(pos, eX * panel_size.x + '0 1.25 0' * hud_fontsize.y, hl_rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL); - drawstring(pos, p, '1 1 0' * hud_fontsize.y, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL); - drawstring(pos + '3 0 0' * hud_fontsize.y, TIME_ENCODED_TOSTRING(t), '1 1 0' * hud_fontsize.y, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + '8 0 0' * hud_fontsize.y, n, '1 1 0' * hud_fontsize.y, sbt_fg_alpha, DRAWFLAG_NORMAL); + drawfill(pos, columnsize, hl_rgb, sbt_highlight_alpha_self, DRAWFLAG_NORMAL); + else if(!((j + column) & 1) && sbt_highlight) + drawfill(pos, columnsize, hl_rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL); + + str = count_ordinal(i+1); + drawstring(pos + text_ofs, str, hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL); + drawstring(pos + text_ofs + eX * ranksize, TIME_ENCODED_TOSTRING(t), hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL); + str = grecordholder[i]; + if(cut) + str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors); + drawcolorcodedstring(pos + text_ofs + eX * (ranksize + timesize), str, hud_fontsize, sbt_fg_alpha, DRAWFLAG_NORMAL); + pos.y += 1.25 * hud_fontsize.y; + j++; + if(j >= ceil(RANKINGS_RECEIVED_CNT / columns)) + { + column++; + j = 0; + pos.x += panel_size.x / columns; + pos.y = panel_pos.y; + } } panel_size.x += panel_bg_padding * 2; // restore initial width @@ -1410,7 +1489,7 @@ void Scoreboard_Draw() panel_pos.y = max((autocvar_con_notify * autocvar_con_notifysize), panel_pos.y); float excess = max(0, max_namesize - autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x); - float fixed_scoreboard_width = bound(vid_conwidth * 0.4, vid_conwidth - excess, vid_conwidth * 0.93); + 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); panel_size.x = fixed_scoreboard_width; @@ -1501,8 +1580,12 @@ void Scoreboard_Draw() { 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, _("Spectators"), hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring(pos, str, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); draw_endBoldFont(); pos.y += 1.25 * hud_fontsize.y;