also support scr_infobar_height

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

diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index 3323bea991b18afe242e9df5cb25961d62e4bdc5..b1aaf34874c500d5520c8f7bcce7e67f4857b05f 100644 (file)
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@ -1,14 +1,10 @@
 // must be loaded AFTER config.cfg
-utf8_enable 1
-r_font_hinting 1 // sorry, setting 2 (full autohinting) totally fails for unifont for now
-r_font_disable_freetype 0
-r_font_size_snapping 2
 loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
-loadfont notify fonts/n019004l.pfb,gfx/vera-sans $con_notifysize
-loadfont chat fonts/n019004l.pfb,gfx/vera-sans $con_chatsize
+loadfont notify fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize
+loadfont chat fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9
-loadfont infobar gfx/vera-sans 8
-loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 12.8 16
-loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 5 6 7 8 9 10 12 $sbar_fontsize $scr_centersize // csqc font
-loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 10 12 14 16 20 24 28 32 // csqc bigfont
-sbar_columns_set
+loadfont infobar fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
+loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 12.8 16 // menu font
+loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc font
+loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 32 // csqc bigfont for compatibility (FIXME remove in 0.2.0 release)
+scoreboard_columns_set