Merge branch 'asciiwolf/xonotic-makefile-fix'

[xonotic/xonotic.git] / data / font-dejavu.pk3dir / font-dejavu.cfg

diff --git a/data/font-dejavu.pk3dir/font-dejavu.cfg b/data/font-dejavu.pk3dir/font-dejavu.cfg
index 4b3200f21d4cfe300e14f7363c40f36efdbe341a..a53420f781c5930187d09a01098da632e76a8329 100644 (file)
--- a/data/font-dejavu.pk3dir/font-dejavu.cfg
+++ b/data/font-dejavu.pk3dir/font-dejavu.cfg
@@ -1,13 +1,12 @@
 // must be loaded AFTER config.cfg
-utf8_enable 1
-r_font_disable_freetype 0
-r_font_size_snapping 2
+set menu_font_cfg font-dejavu.cfg
 loadfont console fonts/DejaVuSansMono,gfx/conchars $con_textsize
 loadfont notify fonts/DejaVuSans-Bold,gfx/vera-sans $con_notifysize
 loadfont chat fonts/DejaVuSans-Bold,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/DejaVuSansMono,gfx/conchars 9
-loadfont infobar fonts/DejaVuSansMono,gfx/conchars 8
-loadfont user0 fonts/DejaVuSans-Bold,gfx/vera-sans 9.6 12 12.8 16
-loadfont user1 fonts/DejaVuSans-Bold,gfx/vera-sans 8 10 14 $sbar_fontsize $scr_centersize // csqc font
-loadfont user2 fonts/DejaVuSans-Bold,gfx/vera-sans 16 24 32 // csqc bigfont
-sbar_columns_set
+loadfont infobar fonts/DejaVuSansMono,gfx/conchars 8 12 $scr_loadingscreen_barheight $scr_infobar_height
+loadfont user0 fonts/DejaVuSans-Bold,gfx/vera-sans 12
+loadfont user1 fonts/DejaVuSans-Bold,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font
+loadfont user2 fonts/DejaVuSans-Bold,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc boldfont
+loadfont user3 fonts/DejaVuSans-Bold,gfx/vera-sans 12 16
+scoreboard_columns_set