Unload 640x480 fonts in the other files too.

diff --git a/data/font-dejavu.pk3dir/font-dejavu.cfg b/data/font-dejavu.pk3dir/font-dejavu.cfg
index e6ccb7a1afafedcd0f072793ad084e242b257a32..052ccab141794dde8da03f11f6a66b69bc65d248 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 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 $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 user3 fonts/DejaVuSans-Bold,gfx/vera-sans 16
 scoreboard_columns_set

diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index 548ffa295c3ba82338f565cf5c9cc63558cbf954..0e23ff5c916e3d13c4dc4a9d1d35808fce462b7d 100644 (file)
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@ -1,11 +1,12 @@
 // must be loaded AFTER config.cfg
+set menu_font_cfg font-nimbussansl.cfg
 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 $scr_infobar_height
-loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 // menu font
+loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 12 // 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 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc boldfont
-loadfont user3 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 12.8 16 // menu boldfont
+loadfont user3 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 16 // menu boldfont
 scoreboard_columns_set

diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg
index 44cfee5e9e040bf143d272a7d85b97a81c14b8d5..023b64ea0078b34d5c5ddb7c6f646fe38c322a7a 100644 (file)
--- a/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@ -1,4 +1,5 @@
 // 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