From 75164d1f4a1fa1a59893b37221a73ba854b1c20c Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 1 Aug 2015 01:33:34 +1000 Subject: [PATCH] Make doublerows broken, but not as much --- qcsrc/client/scoreboard.qc | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index f733abcb8d..8244836892 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -994,16 +994,21 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) } int weapon_cnt = WEP_COUNT - disownedcnt; + + if(weapon_cnt <= 0) + return pos; + int rows; - if(autocvar_scoreboard_accuracy_doublerows) + if(autocvar_scoreboard_accuracy_doublerows && weapon_cnt >= floor(WEP_COUNT * 0.5)) rows = 2; else rows = 1; + int count_perrow = rint(weapon_cnt / rows); float height = 40; float fontsize = height * 1/3; float weapon_height = height * 2/3; - float weapon_width = sbwidth / weapon_cnt; - float g_instagib = 0; + float weapon_width = sbwidth / weapon_cnt / rows; + bool g_instagib = false; drawstring(pos, sprintf(_("Accuracy stats (average %d%%)"), average_accuracy), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y + autocvar_scoreboard_border_thickness; @@ -1018,7 +1023,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) drawborderlines(autocvar_scoreboard_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL); // column highlighting - for(i = 0; i < weapon_cnt/rows; ++i) + for(i = 0; i < count_perrow; ++i) { if(!(i % 2)) drawfill(pos + '1 0 0' * weapon_width * rows * i, '0 1 0' * height * rows + '1 0 0' * weapon_width * rows, '0 0 0', scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL); @@ -1031,19 +1036,21 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) } average_accuracy = 0; - float weapons_with_stats; - weapons_with_stats = 0; + int weapons_with_stats = 0; if(rows == 2) pos.x += weapon_width / 2; if(switchweapon == WEP_VAPORIZER) - g_instagib = 1; // TODO: real detection for instagib? + g_instagib = true; // TODO: real detection for instagib? if(autocvar_scoreboard_accuracy_nocolors) rgb = '1 1 1'; else Accuracy_LoadColors(); + float oldposx = pos.x; + vector tmpos = pos; + for(i = WEP_FIRST; i <= WEP_LAST; ++i) { self = get_weaponinfo(i); @@ -1061,7 +1068,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) weapon_alpha = 0.2 * scoreboard_alpha_fg; // weapon icon - drawpic_aspect_skin(pos, self.model2, '1 0 0' * weapon_width + '0 1 0' * weapon_height, '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(tmpos, self.model2, '1 0 0' * weapon_width + '0 1 0' * weapon_height, '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); // the accuracy if(weapon_stats >= 0) { weapons_with_stats += 1; @@ -1076,11 +1083,13 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) if(!autocvar_scoreboard_accuracy_nocolors) rgb = Accuracy_GetColor(weapon_stats); - drawstring(pos + '1 0 0' * padding + '0 1 0' * weapon_height, s, '1 1 0' * fontsize, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL); + drawstring(tmpos + '1 0 0' * padding + '0 1 0' * weapon_height, s, '1 1 0' * fontsize, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL); } + tmpos.x += weapon_width * rows; pos.x += weapon_width * rows; - if(rows == 2 && i == 6) { - pos.x -= sbwidth; + if(rows == 2 && i == count_perrow) { + tmpos.x = oldposx; + tmpos.y += height; pos.y += height; } } @@ -1093,7 +1102,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) pos.x -= sbwidth; pos.y += height; - pos.y += 1.25 * hud_fontsize.y; + pos.y += 1.25 * hud_fontsize.y; return pos; } -- 2.39.2