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 e6ccb7a1afafedcd0f072793ad084e242b257a32..a53420f781c5930187d09a01098da632e76a8329 100644 (file)
--- a/data/font-dejavu.pk3dir/font-dejavu.cfg
+++ b/data/font-dejavu.pk3dir/font-dejavu.cfg
@@ -1,11 +1,12 @@
 // must be loaded AFTER config.cfg
+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 12 $scr_loadingscreen_barheight $scr_infobar_height
-loadfont user0 fonts/DejaVuSans-Bold,gfx/vera-sans 9.6 12
-loadfont user1 fonts/DejaVuSans-Bold,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc font
-loadfont user2 fonts/DejaVuSans-Bold,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc boldfont
-loadfont user3 fonts/DejaVuSans-Bold,gfx/vera-sans 12.8 16
+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