From: Rudolf Polzer Date: Wed, 12 Jan 2011 19:44:22 +0000 (+0100) Subject: also support scr_infobar_height X-Git-Tag: xonotic-v0.5.0~138 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=de823d9087074994b19222a49685d7d8186c01b5;ds=inline also support scr_infobar_height --- diff --git a/data/font-dejavu.pk3dir/font-dejavu.cfg b/data/font-dejavu.pk3dir/font-dejavu.cfg index 45c72fca..03bfaa09 100644 --- a/data/font-dejavu.pk3dir/font-dejavu.cfg +++ b/data/font-dejavu.pk3dir/font-dejavu.cfg @@ -3,7 +3,7 @@ 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 +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 12.8 16 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 32 // csqc bigfont (remove after 0.2.0 release) diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg index 9fa20f54..b1aaf348 100644 --- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg +++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg @@ -3,7 +3,7 @@ loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize 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 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight +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) diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg index e9da754e..3ff04226 100644 --- a/data/font-xolonium.pk3dir/font-xolonium.cfg +++ b/data/font-xolonium.pk3dir/font-xolonium.cfg @@ -3,7 +3,7 @@ loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize loadfont notify fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize loadfont chat fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9 -loadfont infobar fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight +loadfont infobar fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height loadfont user0 fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 12.8 16 // menu font loadfont user1 fonts/xolonium.otf,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/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 32 // csqc bigfont for compatibility (FIXME remove in 0.2.0 release)