From: terencehill Date: Tue, 5 Jul 2011 16:09:08 +0000 (+0200) Subject: Merge branch 'master' into terencehill/centerprint_stuff X-Git-Tag: xonotic-v0.5.0~159 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ebfd693ebec1b6cf708c58a3330d836d979cd82;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/centerprint_stuff Conflicts: qcsrc/client/scoreboard.qc --- 2ebfd693ebec1b6cf708c58a3330d836d979cd82 diff --cc qcsrc/client/scoreboard.qc index 8d2436d10,37ace81a3..2d32083d3 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@@ -1162,9 -1165,14 +1165,11 @@@ void HUD_DrawScoreboard( pos_z = 0; // Heading - drawstring(pos, _("Scoreboard"), '24 24 0', '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL); + vector sb_heading_fontsize; + sb_heading_fontsize = hud_fontsize * 2; + drawstring(pos, _("Scoreboard"), sb_heading_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL); - - centerprint_start_x = vid_conwidth - 0.5 * (pos_x + stringwidth(_("Scoreboard"), FALSE, sb_heading_fontsize)); - centerprint_start_y = pos_y; - pos_y += 24; + pos_y += sb_heading_fontsize_y + hud_fontsize_y * 0.25; // Draw the scoreboard vector bg_size = drawgetimagesize("gfx/scoreboard/scoreboard_bg") * autocvar_scoreboard_bg_scale;