X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fscoreboard.qc;h=4055f54007f6233d05bd7b5a3fd941f075944f3a;hb=2263dcdfccd2ffb30adc5373ab8b05bd93b2e90f;hp=0476428d7b836e9978cc10913ec8c7a546ee314c;hpb=6b89adf7bf5d63745c2baa2c8cb81e086c967b8c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 0476428d7..4055f5400 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -248,12 +248,12 @@ string HUD_DefaultColumnLayout() { return strcat( // fteqcc sucks "ping pl name | ", - "-teams,race,lms/kills -teams,lms/deaths -teams,lms,race,ka/suicides -race,dm,tdm,ka/frags ", // tdm already has this in "score" + "-teams,race,lms/kills +freezetag/kills -teams,lms/deaths +freezetag/deaths -teams,lms,race,ka/suicides +freezetag/suicides -race,dm,tdm,ka,freezetag/frags ", // tdm already has this in "score" "+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ", "+lms/lives +lms/rank ", "+kh/caps +kh/pushes +kh/destroyed ", "?+race/laps ?+race/time ?+race/fastest ", - "+as/objectives +nexball/faults +nexball/goals +ka/drops +ka/pickups +ka/bckills ", + "+as/objectives +nexball/faults +nexball/goals +ka/drops +ka/pickups +ka/bckills +ka/time +freezetag/revivals ", "-lms,race,nexball/score"); } @@ -266,7 +266,7 @@ void Cmd_HUD_SetFields(float argc) // TODO: re enable with gametype dependant cvars? if(argc < 2) // no arguments provided - argc = tokenizebyseparator(strcat("x ", cvar_string("scoreboard_columns")), " "); + argc = tokenizebyseparator(strcat("x ", autocvar_scoreboard_columns), " "); if(argc < 2) argc = tokenizebyseparator(strcat("x ", HUD_DefaultColumnLayout()), " "); @@ -296,7 +296,6 @@ void Cmd_HUD_SetFields(float argc) hud_num_fields = 0; - drawfont = hud_font; hud_fontsize = HUD_GetFontsize("hud_fontsize"); for(i = 0; i < argc - 1; ++i) @@ -624,9 +623,9 @@ void HUD_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_numb is_spec = (GetPlayerColor(pl.sv_entnum) == COLOR_SPECTATOR); if((rgb == '1 1 1') && (!is_spec)) { - rgb_x = cvar("scoreboard_color_bg_r") + 0.5; - rgb_y = cvar("scoreboard_color_bg_g") + 0.5; - rgb_z = cvar("scoreboard_color_bg_b") + 0.5; } + rgb_x = autocvar_scoreboard_color_bg_r + 0.5; + rgb_y = autocvar_scoreboard_color_bg_g + 0.5; + rgb_z = autocvar_scoreboard_color_bg_b + 0.5; } // Layout: tmp_x = sbwidth; @@ -883,8 +882,10 @@ float HUD_WouldDrawScoreboard() { return 1; else if (intermission == 1) return 1; - else if (getstati(STAT_HEALTH) <= 0 && cvar("cl_deathscoreboard")) + else if (getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != GAME_CTS) return 1; + else if (spectatee_status == -1) + return 1; else if (scoreboard_showscores_force) return 1; return 0; @@ -897,7 +898,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) float i; float weapon_cnt = WEP_COUNT - 3; // either minstanex/nex are hidden, no port-o-launch, no tuba float rows; - if(cvar("scoreboard_accuracy_doublerows")) + if(autocvar_scoreboard_accuracy_doublerows) rows = 2; else rows = 1; @@ -931,7 +932,6 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) drawfill(pos + '0 1 0' * weapon_height + '0 1 0' * height * i, '1 0 0' * sbwidth + '0 1 0' * fontsize, '1 1 1', scoreboard_highlight_alpha, DRAWFLAG_NORMAL); } - drawfont = hud_bigfont; average_accuracy = 0; float weapons_with_stats; weapons_with_stats = 0; @@ -1000,7 +1000,6 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) pos_y += height; } } - drawfont = hud_font; if(weapons_with_stats) average_accuracy = floor(average_accuracy / weapons_with_stats); @@ -1028,9 +1027,9 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_ float is_spec; is_spec = (GetPlayerColor(pl.sv_entnum) == COLOR_SPECTATOR); vector hl_rgb; - hl_rgb_x = cvar("scoreboard_color_bg_r") + 0.5; - hl_rgb_y = cvar("scoreboard_color_bg_g") + 0.5; - hl_rgb_z = cvar("scoreboard_color_bg_b") + 0.5; + hl_rgb_x = autocvar_scoreboard_color_bg_r + 0.5; + hl_rgb_y = autocvar_scoreboard_color_bg_g + 0.5; + hl_rgb_z = autocvar_scoreboard_color_bg_b + 0.5; pos_y += hud_fontsize_y; drawstring(pos, strcat("Rankings"), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL); @@ -1080,14 +1079,14 @@ void HUD_DrawScoreboard() } if(hud_woulddrawscoreboard) { - float scoreboard_fadeinspeed = cvar_or("scoreboard_fadeinspeed", 10); + float scoreboard_fadeinspeed = autocvar_scoreboard_fadeinspeed; if (scoreboard_fadeinspeed) scoreboard_fade_alpha = bound (0, (time - hud_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1); else scoreboard_fade_alpha = 1; } else { - float scoreboard_fadeoutspeed = cvar_or("scoreboard_fadeoutspeed", 5); + float scoreboard_fadeoutspeed = autocvar_scoreboard_fadeoutspeed; if (scoreboard_fadeoutspeed) scoreboard_fade_alpha = bound (0, (1/scoreboard_fadeoutspeed - (time - hud_woulddrawscoreboard_change)) * scoreboard_fadeoutspeed, 1); else @@ -1099,21 +1098,21 @@ void HUD_DrawScoreboard() HUD_UpdatePlayerTeams(); - scoreboard_alpha_bg = cvar("scoreboard_alpha_bg") * scoreboard_fade_alpha * (1 - autocvar__menu_alpha); - scoreboard_alpha_fg = cvar_or("scoreboard_alpha_fg", 1.0) * scoreboard_fade_alpha * (1 - autocvar__menu_alpha); - scoreboard_highlight = cvar("scoreboard_highlight"); - scoreboard_highlight_alpha = cvar_or("scoreboard_highlight_alpha", 0.10) * scoreboard_alpha_fg; - scoreboard_highlight_alpha_self = cvar_or("scoreboard_highlight_alpha_self", 0.25) * scoreboard_alpha_fg; - scoreboard_alpha_name = cvar_or("scoreboard_alpha_name", 0.9) * scoreboard_alpha_fg; - scoreboard_alpha_name_self = cvar_or("scoreboard_alpha_name_self", 1) * scoreboard_alpha_fg; + scoreboard_alpha_bg = autocvar_scoreboard_alpha_bg * scoreboard_fade_alpha * (1 - autocvar__menu_alpha); + scoreboard_alpha_fg = autocvar_scoreboard_alpha_fg * scoreboard_fade_alpha * (1 - autocvar__menu_alpha); + scoreboard_highlight = autocvar_scoreboard_highlight; + scoreboard_highlight_alpha = autocvar_scoreboard_highlight_alpha * scoreboard_alpha_fg; + scoreboard_highlight_alpha_self = autocvar_scoreboard_highlight_alpha_self * scoreboard_alpha_fg; + scoreboard_alpha_name = autocvar_scoreboard_alpha_name * scoreboard_alpha_fg; + scoreboard_alpha_name_self = autocvar_scoreboard_alpha_name_self * scoreboard_alpha_fg; vector rgb, pos, tmp; entity pl, tm; - xmin = cvar("scoreboard_offset_left") * vid_conwidth; - ymin = cvar("con_notify") * cvar("con_notifysize"); + xmin = autocvar_scoreboard_offset_left * vid_conwidth; + ymin = autocvar_con_notify * autocvar_con_notifysize; - xmax = (1 - cvar("scoreboard_offset_right")) * vid_conwidth; + xmax = (1 - autocvar_scoreboard_offset_right) * vid_conwidth; ymax = vid_conheight - ymin; sbwidth = xmax - xmin; @@ -1124,7 +1123,6 @@ void HUD_DrawScoreboard() pos_z = 0; // Heading - drawfont = hud_bigfont; drawstring(pos, "Scoreboard", '24 24 0', '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL); centerprint_start_x = vid_conwidth - 0.5 * (pos_x + stringwidth("Scoreboard", FALSE, '24 24 0')); @@ -1132,10 +1130,8 @@ void HUD_DrawScoreboard() pos_y += 24; - drawfont = hud_font; - // Draw the scoreboard - vector bg_size = drawgetimagesize("gfx/scoreboard/scoreboard_bg") * cvar("scoreboard_bg_scale"); + vector bg_size = drawgetimagesize("gfx/scoreboard/scoreboard_bg") * autocvar_scoreboard_bg_scale; if(teamplay) { @@ -1155,9 +1151,9 @@ void HUD_DrawScoreboard() } else { - rgb_x = cvar("scoreboard_color_bg_r"); - rgb_y = cvar("scoreboard_color_bg_g"); - rgb_z = cvar("scoreboard_color_bg_b"); + rgb_x = autocvar_scoreboard_color_bg_r; + rgb_y = autocvar_scoreboard_color_bg_g; + rgb_z = autocvar_scoreboard_color_bg_b; for(tm = teams.sort_next; tm; tm = tm.sort_next) { @@ -1179,7 +1175,7 @@ void HUD_DrawScoreboard() } pos = HUD_DrawScoreboardRankings(pos, pl, rgb, bg_size); } - else if(cvar("scoreboard_accuracy") && spectatee_status != -1 && !warmup_stage) { + else if(autocvar_scoreboard_accuracy && spectatee_status != -1 && !warmup_stage) { if(teamplay) pos = HUD_DrawScoreboardAccuracyStats(pos, GetTeamRGB(myteam), bg_size); else