X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fscoreboard.qc;h=9e2acb09ca95042691dfd6b17a37212cb70fcc73;hb=dbf920952c3d375c4257df547b57ca759608e0b7;hp=2679fa2cdf7cc94e3fe1235cb50ebf17dd4f78b5;hpb=298eb8cb0eef47ea3b265bac12432fc00232f0a8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 2679fa2cd..9e2acb09c 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -15,13 +15,35 @@ bool sbt_highlight; float sbt_highlight_alpha; float sbt_highlight_alpha_self; -// TODO init autocvars -float autocvar_hud_panel_scoreboard_table_bg_alpha; -float autocvar_hud_panel_scoreboard_table_fg_alpha; -float autocvar_hud_panel_scoreboard_table_fg_alpha_self; -bool autocvar_hud_panel_scoreboard_table_highlight; -float autocvar_hud_panel_scoreboard_table_highlight_alpha; -float autocvar_hud_panel_scoreboard_table_highlight_alpha_self; +// provide basic panel cvars to old clients +// TODO remove them after a future release (0.8.2+) +string autocvar_hud_panel_scoreboard_pos = "0.150000 0.150000"; +string autocvar_hud_panel_scoreboard_size = "0.700000 0.700000"; +string autocvar_hud_panel_scoreboard_bg = "border_default"; +string autocvar_hud_panel_scoreboard_bg_color = "0 0.3 0.5"; +string autocvar_hud_panel_scoreboard_bg_color_team = ""; +string autocvar_hud_panel_scoreboard_bg_alpha = "0.7"; +string autocvar_hud_panel_scoreboard_bg_border = ""; +string autocvar_hud_panel_scoreboard_bg_padding = ""; + +float autocvar_hud_panel_scoreboard_fadeinspeed = 10; +float autocvar_hud_panel_scoreboard_fadeoutspeed = 5; +float autocvar_hud_panel_scoreboard_respawntime_decimals = 1; +float autocvar_hud_panel_scoreboard_table_bg_alpha = 0; +float autocvar_hud_panel_scoreboard_table_bg_scale = 0.25; +float autocvar_hud_panel_scoreboard_table_fg_alpha = 0.9; +float autocvar_hud_panel_scoreboard_table_fg_alpha_self = 1; +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_bg_teams_color_team = 0; + +bool autocvar_hud_panel_scoreboard_accuracy = true; +bool autocvar_hud_panel_scoreboard_accuracy_doublerows = false; +bool autocvar_hud_panel_scoreboard_accuracy_nocolors = false; + +bool autocvar_hud_panel_scoreboard_dynamichud = false; + void drawstringright(vector, string, vector, vector, float, float); void drawstringcenter(vector, string, vector, vector, float, float); @@ -63,6 +85,7 @@ string TranslateScoresLabel(string l) case "rank": return CTX(_("SCO^rank")); case "returns": return CTX(_("SCO^returns")); case "revivals": return CTX(_("SCO^revivals")); + case "rounds": return CTX(_("SCO^rounds won")); case "score": return CTX(_("SCO^score")); case "suicides": return CTX(_("SCO^suicides")); case "takes": return CTX(_("SCO^takes")); @@ -71,25 +94,25 @@ string TranslateScoresLabel(string l) } } -void HUD_InitScores() +void Scoreboard_InitScores() { int i, f; - ps_primary = ps_secondary = ts_primary = ts_secondary = -1; - for(i = 0; i < MAX_SCORE; ++i) - { - f = (scores_flags[i] & SFL_SORT_PRIO_MASK); + ps_primary = ps_secondary = NULL; + ts_primary = ts_secondary = -1; + FOREACH(Scores, true, { + f = (scores_flags(it) & SFL_SORT_PRIO_MASK); if(f == SFL_SORT_PRIO_PRIMARY) - ps_primary = i; + ps_primary = it; if(f == SFL_SORT_PRIO_SECONDARY) - ps_secondary = i; - } - if(ps_secondary == -1) + ps_secondary = it; + }); + if(ps_secondary == NULL) ps_secondary = ps_primary; for(i = 0; i < MAX_TEAMSCORE; ++i) { - f = (teamscores_flags[i] & SFL_SORT_PRIO_MASK); + f = (teamscores_flags(i) & SFL_SORT_PRIO_MASK); if(f == SFL_SORT_PRIO_PRIMARY) ts_primary = i; if(f == SFL_SORT_PRIO_SECONDARY) @@ -98,12 +121,12 @@ void HUD_InitScores() if(ts_secondary == -1) ts_secondary = ts_primary; - Cmd_HUD_SetFields(0); + Cmd_Scoreboard_SetFields(0); } float SetTeam(entity pl, float Team); //float lastpnum; -void HUD_UpdatePlayerTeams() +void Scoreboard_UpdatePlayerTeams() { float Team; entity pl, tmp; @@ -117,7 +140,7 @@ void HUD_UpdatePlayerTeams() if(SetTeam(pl, Team)) { tmp = pl.sort_prev; - HUD_UpdatePlayerPos(pl); + Scoreboard_UpdatePlayerPos(pl); if(tmp) pl = tmp; else @@ -131,7 +154,7 @@ void HUD_UpdatePlayerTeams() */ } -int HUD_CompareScore(int vl, int vr, int f) +int Scoreboard_CompareScore(int vl, int vr, int f) { TC(int, vl); TC(int, vr); TC(int, f); if(f & SFL_ZERO_IS_WORST) @@ -148,7 +171,7 @@ int HUD_CompareScore(int vl, int vr, int f) return -1; } -float HUD_ComparePlayerScores(entity left, entity right) +float Scoreboard_ComparePlayerScores(entity left, entity right) { float vl, vr, r; vl = entcs_GetTeam(left.sv_entnum); @@ -173,21 +196,18 @@ float HUD_ComparePlayerScores(entity left, entity right) return false; } - r = HUD_CompareScore(left.scores[ps_primary], right.scores[ps_primary], scores_flags[ps_primary]); + r = Scoreboard_CompareScore(left.scores(ps_primary), right.scores(ps_primary), scores_flags(ps_primary)); if (r >= 0) return r; - r = HUD_CompareScore(left.scores[ps_secondary], right.scores[ps_secondary], scores_flags[ps_secondary]); + r = Scoreboard_CompareScore(left.scores(ps_secondary), right.scores(ps_secondary), scores_flags(ps_secondary)); if (r >= 0) return r; - int i; - for(i = 0; i < MAX_SCORE; ++i) - { - r = HUD_CompareScore(left.scores[i], right.scores[i], scores_flags[i]); - if (r >= 0) - return r; - } + FOREACH(Scores, true, { + r = Scoreboard_CompareScore(left.scores(it), right.scores(it), scores_flags(it)); + if (r >= 0) return r; + }); if (left.sv_entnum < right.sv_entnum) return true; @@ -195,20 +215,20 @@ float HUD_ComparePlayerScores(entity left, entity right) return false; } -void HUD_UpdatePlayerPos(entity player) +void Scoreboard_UpdatePlayerPos(entity player) { entity ent; - for(ent = player.sort_next; ent && HUD_ComparePlayerScores(player, ent); ent = player.sort_next) + for(ent = player.sort_next; ent && Scoreboard_ComparePlayerScores(player, ent); ent = player.sort_next) { SORT_SWAP(player, ent); } - for(ent = player.sort_prev; ent != players && HUD_ComparePlayerScores(ent, player); ent = player.sort_prev) + for(ent = player.sort_prev; ent != players && Scoreboard_ComparePlayerScores(ent, player); ent = player.sort_prev) { SORT_SWAP(ent, player); } } -float HUD_CompareTeamScores(entity left, entity right) +float Scoreboard_CompareTeamScores(entity left, entity right) { int i, r; @@ -217,17 +237,17 @@ float HUD_CompareTeamScores(entity left, entity right) if(right.team == NUM_SPECTATOR) return 0; - r = HUD_CompareScore(left.teamscores[ts_primary], right.teamscores[ts_primary], teamscores_flags[ts_primary]); + r = Scoreboard_CompareScore(left.teamscores(ts_primary), right.teamscores(ts_primary), teamscores_flags(ts_primary)); if (r >= 0) return r; - r = HUD_CompareScore(left.teamscores[ts_secondary], right.teamscores[ts_secondary], teamscores_flags[ts_secondary]); + 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_SCORE; ++i) + for(i = 0; i < MAX_TEAMSCORE; ++i) { - r = HUD_CompareScore(left.teamscores[i], right.teamscores[i], teamscores_flags[i]); + r = Scoreboard_CompareScore(left.teamscores(i), right.teamscores(i), teamscores_flags(i)); if (r >= 0) return r; } @@ -238,20 +258,20 @@ float HUD_CompareTeamScores(entity left, entity right) return false; } -void HUD_UpdateTeamPos(entity Team) +void Scoreboard_UpdateTeamPos(entity Team) { entity ent; - for(ent = Team.sort_next; ent && HUD_CompareTeamScores(Team, ent); ent = Team.sort_next) + for(ent = Team.sort_next; ent && Scoreboard_CompareTeamScores(Team, ent); ent = Team.sort_next) { SORT_SWAP(Team, ent); } - for(ent = Team.sort_prev; ent != teams && HUD_CompareTeamScores(ent, Team); ent = Team.sort_prev) + for(ent = Team.sort_prev; ent != teams && Scoreboard_CompareTeamScores(ent, Team); ent = Team.sort_prev) { SORT_SWAP(ent, Team); } } -void Cmd_HUD_Help() +void Cmd_Scoreboard_Help() { LOG_INFO(_("You can modify the scoreboard using the ^2scoreboard_columns_set command.\n")); LOG_INFO(_("^3|---------------------------------------------------------------|\n")); @@ -259,11 +279,13 @@ void Cmd_HUD_Help() LOG_INFO(_("^2scoreboard_columns_set default\n")); LOG_INFO(_("^2scoreboard_columns_set ^7field1 field2 ...\n")); LOG_INFO(_("The following field names are recognized (case insensitive):\n")); - LOG_INFO(_("You can use a ^3|^7 to start the right-aligned fields.\n\n")); + LOG_INFO(_("You can use a ^3|^7 to start the right-aligned fields.\n")); + LOG_INFO("\n"); LOG_INFO(_("^3name^7 or ^3nick^7 Name of a player\n")); LOG_INFO(_("^3ping^7 Ping time\n")); LOG_INFO(_("^3pl^7 Packet loss\n")); + LOG_INFO(_("^3elo^7 Player ELO\n")); LOG_INFO(_("^3kills^7 Number of kills\n")); LOG_INFO(_("^3deaths^7 Number of deaths\n")); LOG_INFO(_("^3suicides^7 Number of suicides\n")); @@ -291,7 +313,8 @@ void Cmd_HUD_Help() LOG_INFO(_("^3takes^7 Number of domination points taken (DOM)\n")); LOG_INFO(_("^3bckills^7 Number of ball carrier kills\n")); LOG_INFO(_("^3bctime^7 Total amount of time holding the ball in Keepaway\n")); - LOG_INFO(_("^3score^7 Total score\n\n")); + LOG_INFO(_("^3score^7 Total score\n")); + LOG_INFO("\n"); LOG_INFO(_("Before a field you can put a + or - sign, then a comma separated list\n" "of game types, then a slash, to make the field show up only in these\n" @@ -327,10 +350,10 @@ void Cmd_HUD_Help() " +ka/pickups +ka/bckills +ka/bctime +ft/revivals" \ " -lms,rc,cts,inv,nb/score" -void Cmd_HUD_SetFields(int argc) +void Cmd_Scoreboard_SetFields(int argc) { TC(int, argc); - int i, j, slash; + int i, slash; string str, pattern; float have_name = 0, have_primary = 0, have_secondary = 0, have_separator = 0; float missing; @@ -340,9 +363,10 @@ void Cmd_HUD_SetFields(int argc) // set up a temporary scoreboard layout // no layout can be properly set up until score_info data haven't been received argc = tokenizebyseparator("0 1 ping pl name | score", " "); - ps_primary = 0; - scores_label[ps_primary] = strzone("score"); - scores_flags[ps_primary] = SFL_ALLOW_HIDE; + ps_primary = SP_SCORE; + ps_secondary = SP_SCORE; + scores_label(ps_primary) = strzone("score"); + scores_flags(ps_primary) = SFL_ALLOW_HIDE; } // TODO: re enable with gametype dependant cvars? @@ -360,16 +384,15 @@ void Cmd_HUD_SetFields(int argc) { string s; s = "ping pl name |"; - for(i = 0; i < MAX_SCORE; ++i) - { - if(i != ps_primary) - if(i != ps_secondary) - if(scores_label[i] != "") - s = strcat(s, " ", scores_label[i]); - } + FOREACH(Scores, true, { + if(it != ps_primary) + if(it != ps_secondary) + if(scores_label(it) != "") + s = strcat(s, " ", scores_label(it)); + }); if(ps_secondary != ps_primary) - s = strcat(s, " ", scores_label[ps_secondary]); - s = strcat(s, " ", scores_label[ps_primary]); + s = strcat(s, " ", scores_label(ps_secondary)); + s = strcat(s, " ", scores_label(ps_primary)); argc = tokenizebyseparator(strcat("0 1 ", s), " "); } } @@ -406,6 +429,7 @@ void Cmd_HUD_SetFields(int argc) sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize); str = strtolower(str); + PlayerScoreField j; switch(str) { case "ping": sbt_field[sbt_num_fields] = SP_PING; break; @@ -414,13 +438,17 @@ void Cmd_HUD_SetFields(int argc) 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": sbt_field[sbt_num_fields] = SP_DMG; break; case "dmgtaken": sbt_field[sbt_num_fields] = SP_DMGTAKEN; break; default: { - for(j = 0; j < MAX_SCORE; ++j) - if(str == strtolower(scores_label[j])) + FOREACH(Scores, true, { + if (str == strtolower(scores_label(it))) { + j = it; goto found; // sorry, but otherwise fteqcc -O3 miscompiles this and warns about "unreachable code" + } + }); LABEL(notfound) if(str == "frags") @@ -445,9 +473,9 @@ LABEL(found) break; } - if(scores_flags[ps_primary] & SFL_ALLOW_HIDE) + if(scores_flags(ps_primary) & SFL_ALLOW_HIDE) have_primary = 1; - if(scores_flags[ps_secondary] & SFL_ALLOW_HIDE) + if(scores_flags(ps_secondary) & SFL_ALLOW_HIDE) have_secondary = 1; if(ps_primary == ps_secondary) have_secondary = 1; @@ -497,20 +525,20 @@ LABEL(found) if(!have_secondary) { strunzone(sbt_field_title[sbt_num_fields]); - sbt_field_title[sbt_num_fields] = strzone(TranslateScoresLabel(scores_label[ps_secondary])); + sbt_field_title[sbt_num_fields] = strzone(TranslateScoresLabel(scores_label(ps_secondary))); sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize); sbt_field[sbt_num_fields] = ps_secondary; ++sbt_num_fields; - LOG_INFOF("fixed missing field '%s'\n", scores_label[ps_secondary]); + LOG_INFOF("fixed missing field '%s'\n", scores_label(ps_secondary)); } if(!have_primary) { strunzone(sbt_field_title[sbt_num_fields]); - sbt_field_title[sbt_num_fields] = strzone(TranslateScoresLabel(scores_label[ps_primary])); + sbt_field_title[sbt_num_fields] = strzone(TranslateScoresLabel(scores_label(ps_primary))); sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize); sbt_field[sbt_num_fields] = ps_primary; ++sbt_num_fields; - LOG_INFOF("fixed missing field '%s'\n", scores_label[ps_primary]); + LOG_INFOF("fixed missing field '%s'\n", scores_label(ps_primary)); } } @@ -528,9 +556,8 @@ vector sbt_field_icon2_rgb; float sbt_field_icon0_alpha; float sbt_field_icon1_alpha; float sbt_field_icon2_alpha; -string HUD_GetField(entity pl, int field) +string Scoreboard_GetField(entity pl, PlayerScoreField field) { - TC(int, field); float tmp, num, denom; int f; string str; @@ -590,13 +617,13 @@ string HUD_GetField(entity pl, int field) return entcs_GetName(pl.sv_entnum); case SP_FRAGS: - f = pl.(scores[SP_KILLS]); - f -= pl.(scores[SP_SUICIDES]); + f = pl.(scores(SP_KILLS)); + f -= pl.(scores(SP_SUICIDES)); return ftos(f); case SP_KDRATIO: - num = pl.(scores[SP_KILLS]); - denom = pl.(scores[SP_DEATHS]); + num = pl.(scores(SP_KILLS)); + denom = pl.(scores(SP_DEATHS)); if(denom == 0) { sbt_field_rgb = '0 1 0'; @@ -609,8 +636,8 @@ string HUD_GetField(entity pl, int field) return str; case SP_SUM: - f = pl.(scores[SP_KILLS]); - f -= pl.(scores[SP_DEATHS]); + f = pl.(scores(SP_KILLS)); + f -= pl.(scores(SP_DEATHS)); if(f > 0) { sbt_field_rgb = '0 1 0'; @@ -621,23 +648,33 @@ string HUD_GetField(entity pl, int field) } return ftos(f); + case SP_ELO: + { + float elo = pl.(scores(SP_ELO)); + switch (elo) { + case -1: return "..."; + case -2: return _("N/A"); + default: return ftos(elo); + } + } + case SP_DMG: - num = pl.(scores[SP_DMG]); + num = pl.(scores(SP_DMG)); denom = 1000; str = sprintf("%.1f k", num/denom); return str; case SP_DMGTAKEN: - num = pl.(scores[SP_DMGTAKEN]); + num = pl.(scores(SP_DMGTAKEN)); denom = 1000; str = sprintf("%.1f k", num/denom); return str; default: - tmp = pl.(scores[field]); - f = scores_flags[field]; + tmp = pl.(scores(field)); + f = scores_flags(field); if(field == ps_primary) sbt_field_rgb = '1 1 0'; else if(field == ps_secondary) @@ -653,12 +690,12 @@ float sbt_fixcolumnwidth_len; float sbt_fixcolumnwidth_iconlen; float sbt_fixcolumnwidth_marginlen; -string HUD_FixScoreboardColumnWidth(int i, string str) +string Scoreboard_FixColumnWidth(int i, string str) { TC(int, i); - float field, f; + float f; vector sz; - field = sbt_field[i]; + PlayerScoreField field = sbt_field[i]; sbt_fixcolumnwidth_iconlen = 0; @@ -702,31 +739,76 @@ string HUD_FixScoreboardColumnWidth(int i, string str) if(j != i) if (sbt_field[i] != SP_SEPARATOR) namesize -= sbt_field_size[j] + hud_fontsize.x; - namesize += hud_fontsize.x; sbt_field_size[i] = namesize; if (sbt_fixcolumnwidth_iconlen != 0) - namesize -= sbt_fixcolumnwidth_marginlen + sbt_fixcolumnwidth_iconlen; + namesize -= sbt_fixcolumnwidth_marginlen + sbt_fixcolumnwidth_iconlen * hud_fontsize.x; str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors); sbt_fixcolumnwidth_len = stringwidth(str, true, hud_fontsize); } else sbt_fixcolumnwidth_len = stringwidth(str, false, hud_fontsize); - f = sbt_fixcolumnwidth_len + sbt_fixcolumnwidth_marginlen + sbt_fixcolumnwidth_iconlen; + f = sbt_fixcolumnwidth_len + sbt_fixcolumnwidth_marginlen + sbt_fixcolumnwidth_iconlen * hud_fontsize.x; if(sbt_field_size[i] < f) sbt_field_size[i] = f; return str; } -void HUD_PrintScoreboardItem(vector item_pos, vector rgb, entity pl, bool is_self, int pl_number) +vector Scoreboard_DrawHeader(vector pos, vector rgb) +{ + int i; + vector column_dim = eY * panel_size.y; + vector text_offset = eY * (1.25 - 1) / 2 * hud_fontsize.y; + pos.x += hud_fontsize.x * 0.5; + for(i = 0; i < sbt_num_fields; ++i) + { + if(sbt_field[i] == SP_SEPARATOR) + break; + column_dim.x = sbt_field_size[i] + hud_fontsize.x; + if (sbt_highlight) + if (i % 2) + drawfill(pos - eX * hud_fontsize.x * 0.5, column_dim, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); + drawstring(pos + text_offset, sbt_field_title[i], hud_fontsize, rgb * 1.5, sbt_fg_alpha, DRAWFLAG_NORMAL); + pos.x += column_dim.x; + } + if(sbt_field[i] == SP_SEPARATOR) + { + pos.x = panel_pos.x + panel_size.x - hud_fontsize.x * 0.5; + for(i = sbt_num_fields - 1; i > 0; --i) + { + if(sbt_field[i] == SP_SEPARATOR) + break; + + pos.x -= sbt_field_size[i]; + + if (sbt_highlight) + if (!(i % 2)) + { + if (i == sbt_num_fields-1) + column_dim.x = sbt_field_size[i] + hud_fontsize.x * 0.5; + else + column_dim.x = sbt_field_size[i] + hud_fontsize.x; + drawfill(pos - eX * hud_fontsize.x * 0.5, column_dim, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); + } + + text_offset.x = sbt_field_size[i] - stringwidth(sbt_field_title[i], false, hud_fontsize); + drawstring(pos + text_offset, sbt_field_title[i], hud_fontsize, rgb * 1.5, sbt_fg_alpha, DRAWFLAG_NORMAL); + pos.x -= hud_fontsize.x; + } + } + + pos.x = panel_pos.x; + pos.y += 1.25 * hud_fontsize.y; + return pos; +} + +void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, int pl_number) { TC(bool, is_self); TC(int, pl_number); string str; - int field; - float is_spec; - is_spec = (entcs_GetTeam(pl.sv_entnum) == NUM_SPECTATOR); + bool is_spec = (entcs_GetTeam(pl.sv_entnum) == NUM_SPECTATOR); if(is_spec && !is_self) rgb = '0 0 0'; @@ -739,8 +821,11 @@ void HUD_PrintScoreboardItem(vector item_pos, vector rgb, entity pl, bool is_sel drawfill(h_pos, h_size, rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL); vector pos = item_pos; + pos.x += hud_fontsize.x * 0.5; + pos.y += (1.25 - 1) / 2 * hud_fontsize.y; // center text vertically vector tmp = '0 0 0'; int i; + PlayerScoreField field; for(i = 0; i < sbt_num_fields; ++i) { field = sbt_field[i]; @@ -751,8 +836,8 @@ void HUD_PrintScoreboardItem(vector item_pos, vector rgb, entity pl, bool is_sel pos.x += sbt_field_size[i] + hud_fontsize.x; continue; } - str = HUD_GetField(pl, field); - str = HUD_FixScoreboardColumnWidth(i, str); + str = Scoreboard_GetField(pl, field); + str = Scoreboard_FixColumnWidth(i, str); pos.x += sbt_field_size[i] + hud_fontsize.x; @@ -790,7 +875,7 @@ void HUD_PrintScoreboardItem(vector item_pos, vector rgb, entity pl, bool is_sel if(sbt_field[i] == SP_SEPARATOR) { - pos.x = item_pos.x + panel_size.x; + pos.x = item_pos.x + panel_size.x - hud_fontsize.x * 0.5; for(i = sbt_num_fields-1; i > 0; --i) { field = sbt_field[i]; @@ -802,8 +887,8 @@ void HUD_PrintScoreboardItem(vector item_pos, vector rgb, entity pl, bool is_sel continue; } - str = HUD_GetField(pl, field); - str = HUD_FixScoreboardColumnWidth(i, str); + str = Scoreboard_GetField(pl, field); + str = Scoreboard_FixColumnWidth(i, str); if(field == SP_NAME) { tmp.x = sbt_fixcolumnwidth_len; // left or right aligned? let's put it right... @@ -843,9 +928,8 @@ void HUD_PrintScoreboardItem(vector item_pos, vector rgb, entity pl, bool is_sel drawfill(h_pos, h_size, '0 0 0', 0.5 * panel_fg_alpha, DRAWFLAG_NORMAL); } -vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) +vector Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) { - vector column_dim = '0 0 0'; entity pl; panel_pos = pos; @@ -853,7 +937,9 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz panel_size.y += panel_bg_padding * 2; HUD_Panel_DrawBg(scoreboard_fade_alpha); - vector end_pos = panel_pos + eY * (panel_size.y + panel_bg_border * 2 + hud_fontsize.y); + vector end_pos = panel_pos + eY * (panel_size.y + hud_fontsize.y); + if(panel.current_panel_bg != "0") + end_pos.y += panel_bg_border * 2; if(panel_bg_padding) { @@ -875,75 +961,18 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz if (sbt_bg_alpha) drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha, DRAWFLAG_NORMAL); - // go back to the top to make alternated columns highlighting and to print the strings - pos.y -= 1.25 * hud_fontsize.y; - if (sbt_highlight) - column_dim.y = panel_size.y; - - // print the strings of the columns headers and draw the columns - int i; - for(i = 0; i < sbt_num_fields; ++i) - { - if(sbt_field[i] == SP_SEPARATOR) - break; - column_dim.x = sbt_field_size[i] + hud_fontsize.x; - if (sbt_highlight) - { - if (i % 2) - drawfill(pos - eX * hud_fontsize.x * 0.5, column_dim, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); - } - drawstring(pos, sbt_field_title[i], hud_fontsize, rgb * 1.5, sbt_fg_alpha, DRAWFLAG_NORMAL); - pos.x += column_dim.x; - } - if(sbt_field[i] == SP_SEPARATOR) - { - pos.x = panel_pos.x + panel_size.x; - tmp.y = 0; - for(i = sbt_num_fields - 1; i > 0; --i) - { - if(sbt_field[i] == SP_SEPARATOR) - break; - - pos.x -= sbt_field_size[i]; - - if (sbt_highlight) - { - if (!(i % 2)) - { - if (i == sbt_num_fields-1) - column_dim.x = sbt_field_size[i] + hud_fontsize.x * 0.5; - else - column_dim.x = sbt_field_size[i] + hud_fontsize.x; - if(i == sbt_num_fields - 1) - drawfill(pos - eX * hud_fontsize.x * 0.5, column_dim, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); - else - drawfill(pos - eX * hud_fontsize.x * 0.5, column_dim, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); - } - } - - tmp.x = stringwidth(sbt_field_title[i], false, hud_fontsize); - tmp.x = (sbt_field_size[i] - tmp.x); - drawstring(pos + tmp, sbt_field_title[i], hud_fontsize, rgb * 1.5, sbt_fg_alpha, DRAWFLAG_NORMAL); - pos.x -= hud_fontsize.x; - } - } - - pos.x = panel_pos.x; - pos.y += 1.25 * hud_fontsize.y; // skip the header - - // item size - tmp.x = panel_size.x; - tmp.y = hud_fontsize.y * 1.25; + // print header row and highlight columns + pos = Scoreboard_DrawHeader(panel_pos, rgb); // fill the table and draw the rows - i = 0; + int i = 0; if (teamplay) for(pl = players.sort_next; pl; pl = pl.sort_next) { if(pl.team != tm.team) continue; - HUD_PrintScoreboardItem(pos, rgb, pl, (pl.sv_entnum == player_localnum), i); + Scoreboard_DrawItem(pos, rgb, pl, (pl.sv_entnum == player_localnum), i); pos.y += 1.25 * hud_fontsize.y; ++i; } @@ -952,7 +981,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz { if(pl.team == NUM_SPECTATOR) continue; - HUD_PrintScoreboardItem(pos, rgb, pl, (pl.sv_entnum == player_localnum), i); + Scoreboard_DrawItem(pos, rgb, pl, (pl.sv_entnum == player_localnum), i); pos.y += 1.25 * hud_fontsize.y; ++i; } @@ -961,7 +990,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz return end_pos; } -float HUD_WouldDrawScoreboard() { +float Scoreboard_WouldDraw() { if (QuickMenu_IsOpened()) return 0; else if (HUD_Radar_Clickable()) @@ -980,7 +1009,7 @@ float HUD_WouldDrawScoreboard() { } float average_accuracy; -vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) +vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) { WepSet weapons_stat = WepSet_GetFromStat(); WepSet weapons_inmap = WepSet_GetFromStat_InMap(); @@ -997,7 +1026,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) if (weapon_cnt <= 0) return pos; int rows = 1; - if (autocvar_scoreboard_accuracy_doublerows && weapon_cnt >= floor((Weapons_COUNT - 1) * 0.5)) + if (autocvar_hud_panel_scoreboard_accuracy_doublerows && weapon_cnt >= floor((Weapons_COUNT - 1) * 0.5)) rows = 2; int columnns = ceil(weapon_cnt / rows); @@ -1005,14 +1034,17 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) drawstring(pos + eX * panel_bg_padding, sprintf(_("Accuracy stats (average %d%%)"), average_accuracy), hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; - pos.y += panel_bg_border; + if(panel.current_panel_bg != "0") + pos.y += panel_bg_border; panel_pos = pos; panel_size.y = height * rows; panel_size.y += panel_bg_padding * 2; HUD_Panel_DrawBg(scoreboard_fade_alpha); - vector end_pos = panel_pos + eY * (panel_size.y + panel_bg_border * 2 + hud_fontsize.y); + vector end_pos = panel_pos + eY * (panel_size.y + hud_fontsize.y); + if(panel.current_panel_bg != "0") + end_pos.y += panel_bg_border * 2; if(panel_bg_padding) { @@ -1030,21 +1062,24 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) if (sbt_bg_alpha) drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha, DRAWFLAG_NORMAL); - // column highlighting - for (int i = 0; i < columnns; ++i) - if ((i % 2) == 0) - drawfill(pos + eX * weapon_width * rows * i, eY * height * rows + eX * weapon_width * rows, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); - - // row highlighting - for (int i = 0; i < rows; ++i) - drawfill(pos + eY * weapon_height + eY * height * i, eX * tmp.x + eY * fontsize, '1 1 1', sbt_highlight_alpha, DRAWFLAG_NORMAL); + if(sbt_highlight) + { + // column highlighting + for (int i = 0; i < columnns; ++i) + if ((i % 2) == 0) + drawfill(pos + eX * weapon_width * rows * i, eY * height * rows + eX * weapon_width * rows, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); + + // row highlighting + for (int i = 0; i < rows; ++i) + drawfill(pos + eY * weapon_height + eY * height * i, eX * tmp.x + eY * fontsize, '1 1 1', sbt_highlight_alpha, DRAWFLAG_NORMAL); + } average_accuracy = 0; int weapons_with_stats = 0; if (rows == 2) pos.x += weapon_width / 2; - if (autocvar_scoreboard_accuracy_nocolors) + if (autocvar_hud_panel_scoreboard_accuracy_nocolors) rgb = '1 1 1'; else Accuracy_LoadColors(); @@ -1079,7 +1114,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) float padding; padding = (weapon_width - stringwidth(s, false, eX * fontsize)) / 2; // center the accuracy value - if(!autocvar_scoreboard_accuracy_nocolors) + if(!autocvar_hud_panel_scoreboard_accuracy_nocolors) rgb = Accuracy_GetColor(weapon_stats); drawstring(tmpos + eX * padding + eY * weapon_height, s, '1 1 0' * fontsize, rgb, sbt_fg_alpha, DRAWFLAG_NORMAL); @@ -1101,7 +1136,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) return end_pos; } -vector HUD_DrawKeyValue(vector pos, string key, string value) { +vector MapStats_DrawKeyValue(vector pos, string key, string value) { float px = pos.x; pos.x += hud_fontsize.x * 0.25; drawstring(pos, key, hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL); @@ -1113,7 +1148,7 @@ vector HUD_DrawKeyValue(vector pos, string key, string value) { return pos; } -vector HUD_DrawMapStats(vector pos, vector rgb, vector bg_size) { +vector Scoreboard_MapStats_Draw(vector pos, vector rgb, vector bg_size) { float stat_secrets_found, stat_secrets_total; float stat_monsters_killed, stat_monsters_total; float rows = 0; @@ -1140,14 +1175,17 @@ vector HUD_DrawMapStats(vector pos, vector rgb, vector bg_size) { // draw table header drawstring(pos + eX * panel_bg_padding, _("Map stats:"), hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; - pos.y += panel_bg_border; + if(panel.current_panel_bg != "0") + pos.y += panel_bg_border; panel_pos = pos; panel_size.y = hud_fontsize.y * rows; panel_size.y += panel_bg_padding * 2; HUD_Panel_DrawBg(scoreboard_fade_alpha); - vector end_pos = panel_pos + eY * (panel_size.y + panel_bg_border * 2 + hud_fontsize.y); + vector end_pos = panel_pos + eY * (panel_size.y + hud_fontsize.y); + if(panel.current_panel_bg != "0") + end_pos.y += panel_bg_border * 2; if(panel_bg_padding) { @@ -1165,14 +1203,14 @@ vector HUD_DrawMapStats(vector pos, vector rgb, vector bg_size) { if(stat_monsters_total) { val = sprintf("%d/%d", stat_monsters_killed, stat_monsters_total); - pos = HUD_DrawKeyValue(pos, _("Monsters killed:"), val); + pos = MapStats_DrawKeyValue(pos, _("Monsters killed:"), val); } // draw secrets if(stat_secrets_total) { val = sprintf("%d/%d", stat_secrets_found, stat_secrets_total); - pos = HUD_DrawKeyValue(pos, _("Secrets found:"), val); + pos = MapStats_DrawKeyValue(pos, _("Secrets found:"), val); } panel_size.x += panel_bg_padding * 2; // restore initial width @@ -1180,7 +1218,7 @@ vector HUD_DrawMapStats(vector pos, vector rgb, vector bg_size) { } -vector HUD_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_size) +vector Scoreboard_Rankings_Draw(vector pos, entity pl, vector rgb, vector bg_size) { int i; RANKINGS_RECEIVED_CNT = 0; @@ -1196,14 +1234,17 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_s pos.y += hud_fontsize.y; drawstring(pos + eX * panel_bg_padding, _("Rankings"), hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; - pos.y += panel_bg_border; + if(panel.current_panel_bg != "0") + pos.y += panel_bg_border; panel_pos = pos; panel_size.y = 1.25 * hud_fontsize.y * RANKINGS_RECEIVED_CNT; panel_size.y += panel_bg_padding * 2; HUD_Panel_DrawBg(scoreboard_fade_alpha); - vector end_pos = panel_pos + eY * (panel_size.y + panel_bg_border * 2 + hud_fontsize.y); + vector end_pos = panel_pos + eY * (panel_size.y + hud_fontsize.y); + if(panel.current_panel_bg != "0") + end_pos.y += panel_bg_border * 2; if(panel_bg_padding) { @@ -1241,32 +1282,24 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_s return end_pos; } -float hud_woulddrawscoreboard_prev; -float hud_woulddrawscoreboard_change; // "time" at which HUD_WouldDrawScoreboard() changed -void HUD_DrawScoreboard() +void Scoreboard_Draw() { if(!autocvar__hud_configure) { - float hud_woulddrawscoreboard; - hud_woulddrawscoreboard = scoreboard_active; - if(hud_woulddrawscoreboard != hud_woulddrawscoreboard_prev) { - hud_woulddrawscoreboard_change = time; - hud_woulddrawscoreboard_prev = hud_woulddrawscoreboard; - } - - if(hud_woulddrawscoreboard) { - if(menu_enabled == 1) + // frametime checks allow to toggle the scoreboard even when the game is paused + if(scoreboard_active) { + if(hud_configure_menu_open == 1) scoreboard_fade_alpha = 1; - float scoreboard_fadeinspeed = autocvar_scoreboard_fadeinspeed; - if (scoreboard_fadeinspeed) - scoreboard_fade_alpha = bound (0, (time - hud_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1); + float scoreboard_fadeinspeed = autocvar_hud_panel_scoreboard_fadeinspeed; + if (scoreboard_fadeinspeed && frametime) + scoreboard_fade_alpha = min(1, scoreboard_fade_alpha + frametime * scoreboard_fadeinspeed); else scoreboard_fade_alpha = 1; } else { - float scoreboard_fadeoutspeed = autocvar_scoreboard_fadeoutspeed; - if (scoreboard_fadeoutspeed) - scoreboard_fade_alpha = bound (0, (1/scoreboard_fadeoutspeed - (time - hud_woulddrawscoreboard_change)) * scoreboard_fadeoutspeed, 1); + float scoreboard_fadeoutspeed = autocvar_hud_panel_scoreboard_fadeoutspeed; + if (scoreboard_fadeoutspeed && frametime) + scoreboard_fade_alpha = max(0, scoreboard_fade_alpha - frametime * scoreboard_fadeoutspeed); else scoreboard_fade_alpha = 0; } @@ -1277,19 +1310,19 @@ void HUD_DrawScoreboard() else scoreboard_fade_alpha = 0; - if (autocvar_scoreboard_dynamichud) + if (autocvar_hud_panel_scoreboard_dynamichud) HUD_Scale_Enable(); else HUD_Scale_Disable(); float hud_fade_alpha_save = hud_fade_alpha; - if(menu_enabled == 1) + if(hud_configure_menu_open == 1) hud_fade_alpha = 1; else hud_fade_alpha = scoreboard_fade_alpha * (1 - autocvar__menu_alpha); HUD_Panel_UpdateCvars(); - sbt_bg_alpha = autocvar_hud_panel_scoreboard_table_bg_alpha; + sbt_bg_alpha = autocvar_hud_panel_scoreboard_table_bg_alpha * panel_fg_alpha; 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; @@ -1302,7 +1335,7 @@ void HUD_DrawScoreboard() if(!autocvar__hud_configure) panel_pos.y = max((autocvar_con_notify * autocvar_con_notifysize), panel_pos.y); - HUD_UpdatePlayerTeams(); + Scoreboard_UpdatePlayerTeams(); vector pos, tmp; entity pl, tm; @@ -1319,37 +1352,48 @@ void HUD_DrawScoreboard() draw_endBoldFont(); pos.y += sb_heading_fontsize.y; - pos.y += panel_bg_border; + if(panel.current_panel_bg != "0") + pos.y += panel_bg_border; // Draw the scoreboard - vector bg_size = draw_getimagesize("gfx/scoreboard/scoreboard_bg") * ((autocvar_scoreboard_bg_scale > 0) ? autocvar_scoreboard_bg_scale : 0.25); + float scale = autocvar_hud_panel_scoreboard_table_bg_scale; + if(scale <= 0) + scale = 0.25; + vector bg_size = draw_getimagesize("gfx/scoreboard/scoreboard_bg") * scale; if(teamplay) { - vector team_score_baseoffset = eY * hud_fontsize.y - eX * (panel_bg_border + hud_fontsize.x * 0.5); + vector panel_bg_color_save = panel_bg_color; + vector team_score_baseoffset = eY * hud_fontsize.y - eX * hud_fontsize.x * 0.5; + if(panel.current_panel_bg != "0") + team_score_baseoffset.x -= panel_bg_border; for(tm = teams.sort_next; tm; tm = tm.sort_next) { if(tm.team == NUM_SPECTATOR) continue; - if(!tm.team && teamplay) + if(!tm.team) continue; draw_beginBoldFont(); vector rgb = Team_ColorRGB(tm.team); - str = ftos(tm.(teamscores[ts_primary])); + str = ftos(tm.(teamscores(ts_primary))); drawstring(pos + team_score_baseoffset - eX * stringwidth(str, false, hud_fontsize * 1.5), str, hud_fontsize * 1.5, rgb, panel_fg_alpha, DRAWFLAG_NORMAL); if(ts_primary != ts_secondary) { - str = ftos(tm.(teamscores[ts_secondary])); + str = ftos(tm.(teamscores(ts_secondary))); drawstring(pos + team_score_baseoffset - eX * stringwidth(str, false, hud_fontsize) + eY * hud_fontsize.y * 1.5, str, hud_fontsize, rgb, panel_fg_alpha, DRAWFLAG_NORMAL); } draw_endBoldFont(); - - panel_bg_color = rgb * panel_bg_color_team; - pos = HUD_Scoreboard_MakeTable(pos, tm, panel_bg_color, bg_size); + if(autocvar_hud_panel_scoreboard_bg_teams_color_team > 0) + panel_bg_color = rgb * autocvar_hud_panel_scoreboard_bg_teams_color_team; + else if(panel_bg_color_team > 0) + panel_bg_color = rgb * panel_bg_color_team; + else + panel_bg_color = rgb; + pos = Scoreboard_MakeTable(pos, tm, panel_bg_color, bg_size); } - panel_bg_color = Team_ColorRGB(myteam) * panel_bg_color_team; + panel_bg_color = panel_bg_color_save; } else { @@ -1357,10 +1401,8 @@ void HUD_DrawScoreboard() { if(tm.team == NUM_SPECTATOR) continue; - if(!tm.team && teamplay) - continue; - pos = HUD_Scoreboard_MakeTable(pos, tm, panel_bg_color, bg_size); + pos = Scoreboard_MakeTable(pos, tm, panel_bg_color, bg_size); } } @@ -1373,13 +1415,12 @@ void HUD_DrawScoreboard() drawcolorcodedstring(pos, sprintf(_("All-time fastest: %d%s ^7(%s^7)"), race_speedaward_alltimebest, race_speedaward_alltimebest_unit, race_speedaward_alltimebest_holder), hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; } - pos = HUD_DrawScoreboardRankings(pos, playerslots[player_localnum], panel_bg_color, bg_size); - } - else if (autocvar_scoreboard_accuracy && !warmup_stage && gametype != MAPINFO_TYPE_NEXBALL) { - pos = HUD_DrawScoreboardAccuracyStats(pos, panel_bg_color, bg_size); + pos = Scoreboard_Rankings_Draw(pos, playerslots[player_localnum], panel_bg_color, bg_size); } + else if (autocvar_hud_panel_scoreboard_accuracy && !warmup_stage && gametype != MAPINFO_TYPE_NEXBALL) + pos = Scoreboard_AccuracyStats_Draw(pos, panel_bg_color, bg_size); - pos = HUD_DrawMapStats(pos, panel_bg_color, bg_size); + pos = Scoreboard_MapStats_Draw(pos, panel_bg_color, bg_size); // List spectators float specs = 0; @@ -1389,7 +1430,7 @@ void HUD_DrawScoreboard() if(pl.team != NUM_SPECTATOR) continue; pos.y += 1.25 * hud_fontsize.y; - HUD_PrintScoreboardItem(pos, panel_bg_color, pl, (pl.sv_entnum == player_localnum), specs); + Scoreboard_DrawItem(pos, panel_bg_color, pl, (pl.sv_entnum == player_localnum), specs); ++specs; } @@ -1422,17 +1463,17 @@ void HUD_DrawScoreboard() str = strcat(str, _(" or")); if(teamplay) { - str = strcat(str, sprintf(_(" until ^3%s %s^7"), ScoreString(teamscores_flags[ts_primary], fl), - (teamscores_label[ts_primary] == "score") ? CTX(_("SCO^points")) : - (teamscores_label[ts_primary] == "fastest") ? CTX(_("SCO^is beaten")) : - TranslateScoresLabel(teamscores_label[ts_primary]))); + str = strcat(str, sprintf(_(" until ^3%s %s^7"), ScoreString(teamscores_flags(ts_primary), fl), + (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) : + (teamscores_label(ts_primary) == "fastest") ? CTX(_("SCO^is beaten")) : + TranslateScoresLabel(teamscores_label(ts_primary)))); } else { - str = strcat(str, sprintf(_(" until ^3%s %s^7"), ScoreString(scores_flags[ps_primary], fl), - (scores_label[ps_primary] == "score") ? CTX(_("SCO^points")) : - (scores_label[ps_primary] == "fastest") ? CTX(_("SCO^is beaten")) : - TranslateScoresLabel(scores_label[ps_primary]))); + str = strcat(str, sprintf(_(" until ^3%s %s^7"), ScoreString(scores_flags(ps_primary), fl), + (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) : + (scores_label(ps_primary) == "fastest") ? CTX(_("SCO^is beaten")) : + TranslateScoresLabel(scores_label(ps_primary)))); } } if(ll > 0) @@ -1441,17 +1482,17 @@ void HUD_DrawScoreboard() str = strcat(str, _(" or")); if(teamplay) { - str = strcat(str, sprintf(_(" until a lead of ^3%s %s^7"), ScoreString(teamscores_flags[ts_primary], ll), - (teamscores_label[ts_primary] == "score") ? CTX(_("SCO^points")) : - (teamscores_label[ts_primary] == "fastest") ? CTX(_("SCO^is beaten")) : - TranslateScoresLabel(teamscores_label[ts_primary]))); + str = strcat(str, sprintf(_(" until a lead of ^3%s %s^7"), ScoreString(teamscores_flags(ts_primary), ll), + (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) : + (teamscores_label(ts_primary) == "fastest") ? CTX(_("SCO^is beaten")) : + TranslateScoresLabel(teamscores_label(ts_primary)))); } else { - str = strcat(str, sprintf(_(" until a lead of ^3%s %s^7"), ScoreString(scores_flags[ps_primary], ll), - (scores_label[ps_primary] == "score") ? CTX(_("SCO^points")) : - (scores_label[ps_primary] == "fastest") ? CTX(_("SCO^is beaten")) : - TranslateScoresLabel(scores_label[ps_primary]))); + str = strcat(str, sprintf(_(" until a lead of ^3%s %s^7"), ScoreString(scores_flags(ps_primary), ll), + (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) : + (scores_label(ps_primary) == "fastest") ? CTX(_("SCO^is beaten")) : + TranslateScoresLabel(scores_label(ps_primary)))); } } } @@ -1468,23 +1509,25 @@ void HUD_DrawScoreboard() { // a negative number means we are awaiting respawn, time value is still the same respawn_time *= -1; // remove mark now that we checked it - respawn_time = max(time, respawn_time); // don't show a negative value while the server is respawning the player (lag) - str = sprintf(_("^1Respawning in ^3%s^1..."), - (autocvar_scoreboard_respawntime_decimals ? - count_seconds_decs(respawn_time - time, autocvar_scoreboard_respawntime_decimals) - : - count_seconds(respawn_time - time) - ) - ); + if(respawn_time < time) // it happens for a few frames when server is respawning the player + str = ""; // draw an empty string to not change suddenly scoreboard_bottom + else + str = sprintf(_("^1Respawning in ^3%s^1..."), + (autocvar_hud_panel_scoreboard_respawntime_decimals ? + count_seconds_decs(respawn_time - time, autocvar_hud_panel_scoreboard_respawntime_decimals) + : + count_seconds(ceil(respawn_time - time)) + ) + ); } else if(time < respawn_time) { str = sprintf(_("You are dead, wait ^3%s^7 before respawning"), - (autocvar_scoreboard_respawntime_decimals ? - count_seconds_decs(respawn_time - time, autocvar_scoreboard_respawntime_decimals) + (autocvar_hud_panel_scoreboard_respawntime_decimals ? + count_seconds_decs(respawn_time - time, autocvar_hud_panel_scoreboard_respawntime_decimals) : - count_seconds(respawn_time - time) + count_seconds(ceil(respawn_time - time)) ) ); }