Merge branch 'asciiwolf/xonotic-makefile-fix'

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

diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg
index 023b64ea0078b34d5c5ddb7c6f646fe38c322a7a..2f98e326f4515dd706b7d9d1bd48d4a2fd053b06 100644 (file)
--- a/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@ -1,12 +1,12 @@
 // must be loaded AFTER config.cfg
 set menu_font_cfg font-xolonium.cfg
-loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
-loadfont notify fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize
-loadfont chat fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize
-loadfont centerprint fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 9
-loadfont infobar fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
-loadfont user0 fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 12 // menu font
-loadfont user1 fonts/xolonium-regular.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-bold.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 bold font
-loadfont user3 fonts/xolonium-bold.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 16 // menu boldfont
+loadfont console fonts/unifont,fonts/xolonium-regular.otf,gfx/vera-sans $con_textsize
+loadfont notify fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans $con_notifysize
+loadfont chat fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans $con_chatsize
+loadfont centerprint fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 9
+loadfont infobar fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
+loadfont user0 fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 12 // menu font
+loadfont user1 fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font
+loadfont user2 fonts/xolonium-bold.otf,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc bold font
+loadfont user3 fonts/xolonium-bold.otf,fonts/unifont,gfx/vera-sans 12 16 // menu boldfont
 scoreboard_columns_set