Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

Conflicts:
	data/font-nimbussansl.pk3dir/font-nimbussansl.cfg

diff --git a/data/font-dejavu.pk3dir/font-dejavu.cfg b/data/font-dejavu.pk3dir/font-dejavu.cfg
index 4b3200f21d4cfe300e14f7363c40f36efdbe341a..ba9b4147cf34a807a5ef1e402fa20c7a9179ebc6 100644 (file)
--- a/data/font-dejavu.pk3dir/font-dejavu.cfg
+++ b/data/font-dejavu.pk3dir/font-dejavu.cfg
@@ -8,6 +8,6 @@ loadfont chat fonts/DejaVuSans-Bold,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/DejaVuSansMono,gfx/conchars 9
 loadfont infobar fonts/DejaVuSansMono,gfx/conchars 8
 loadfont user0 fonts/DejaVuSans-Bold,gfx/vera-sans 9.6 12 12.8 16
-loadfont user1 fonts/DejaVuSans-Bold,gfx/vera-sans 8 10 14 $sbar_fontsize $scr_centersize // csqc font
+loadfont user1 fonts/DejaVuSans-Bold,gfx/vera-sans 8 10 14 $hud_fontsize $scr_centersize // csqc font
 loadfont user2 fonts/DejaVuSans-Bold,gfx/vera-sans 16 24 32 // csqc bigfont
-sbar_columns_set
+scoreboard_columns_set

diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index 3323bea991b18afe242e9df5cb25961d62e4bdc5..4afab42f1296bab6d02029c86d70215b3e616d8f 100644 (file)
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@ -11,4 +11,4 @@ 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
+scoreboard_columns_set