#include <client/draw.qh>
#include <client/hud/panel/chat.qh>
+#include <client/hud/panel/physics.qh>
#include <client/hud/panel/quickmenu.qh>
#include <client/hud/panel/racetimer.qh>
#include <client/hud/panel/weapons.qh>
//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)
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;
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);
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);
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);
}
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;
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;
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);
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)
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;
return end_pos;
}
-
+int rankings_rows = 0;
+int rankings_columns = 0;
+int rankings_cnt = 0;
vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector rgb, vector bg_size)
{
int i;
vector hl_rgb = rgb + '0.5 0.5 0.5';
- pos.y += hud_fontsize.y;
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")
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;
HUD_Panel_DrawBg();
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)
+ for(i = 0; i < rankings_cnt; ++i)
{
float t;
t = grecordtime[i];
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);
+ drawstring(pos + text_ofs + eX * ranksize, TIME_ENCODED_TOSTRING(t, true), hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL);
str = ColorTranslateRGB(grecordholder[i]);
if(cut)
str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors);
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;
}
}
return true;
}
-vector Scoreboard_Spectators_Draw(vector pos, entity tm, string str, vector hud_fontsize) {
+vector Scoreboard_Spectators_Draw(vector pos) {
- entity pl;
+ entity pl, tm;
+ string str = "";
for(pl = players.sort_next; pl; pl = pl.sort_next)
{
break;
}
}
+ if (str != "") // if there's at least one spectator
+ pos.y += 0.5 * hud_fontsize.y;
return pos;
}
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 tm;
string str;
// draw scoreboard spectators before accuracy and item stats
if (autocvar_hud_panel_scoreboard_spectators_position == 0) {
- pos = Scoreboard_Spectators_Draw(pos, tm, str, hud_fontsize);
+ pos = Scoreboard_Spectators_Draw(pos);
}
- // draw accuracy and item stats
+ // 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))
// draw scoreboard spectators after accuracy and item stats and before rankings
if (autocvar_hud_panel_scoreboard_spectators_position == 1) {
- pos = Scoreboard_Spectators_Draw(pos, tm, str, hud_fontsize);
+ pos = Scoreboard_Spectators_Draw(pos);
}
if(MUTATOR_CALLHOOK(ShowRankings)) {
string ranktitle = M_ARGV(0, string);
+ string unit = GetSpeedUnit(autocvar_hud_panel_physics_speed_unit);
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);
+ drawcolorcodedstring(pos, sprintf(_("Speed award: %d%s ^7(%s^7)"), 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);
+ drawcolorcodedstring(pos, sprintf(_("All-time fastest: %d%s ^7(%s^7)"), race_speedaward_alltimebest, unit, ColorTranslateRGB(race_speedaward_alltimebest_holder)), hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
pos.y += 1.25 * hud_fontsize.y;
}
+ if (race_speedaward || race_speedaward_alltimebest)
+ pos.y += 0.25 * hud_fontsize.y;
pos = Scoreboard_Rankings_Draw(pos, ranktitle, playerslots[player_localnum], panel_bg_color, bg_size);
}
+ else
+ rankings_cnt = 0;
// draw scoreboard spectators after rankings
if (autocvar_hud_panel_scoreboard_spectators_position == 2) {
- pos = Scoreboard_Spectators_Draw(pos, tm, str, hud_fontsize);
+ pos = Scoreboard_Spectators_Draw(pos);
}
pos = Scoreboard_MapStats_Draw(pos, panel_bg_color, bg_size);
// draw scoreboard spectators after mapstats
if (autocvar_hud_panel_scoreboard_spectators_position == 3) {
- pos = Scoreboard_Spectators_Draw(pos, tm, str, hud_fontsize);
+ pos = Scoreboard_Spectators_Draw(pos);
}
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;
}
}