r5775 - in trunk/data: . qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-06 04:13:03 -0500 (Fri, 06 Feb 2009)
New Revision: 5775

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/client/mapvoting.qc
   trunk/data/qcsrc/client/miscfunctions.qc
   trunk/data/qcsrc/client/sbar.qc
Log:
make centerprint font size cvar-customizable


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-02-06 09:08:56 UTC (rev 5774)
+++ trunk/data/defaultNexuiz.cfg	2009-02-06 09:13:03 UTC (rev 5775)
@@ -1223,6 +1223,7 @@
 
 // sbar: font size
 seta sbar_fontsize 11
+seta scr_centersize 11
 seta sbar_width 480
 alias sbar_font "loadfont user1 $*; loadfont user2 ${*}-big; sbar_columns_set"
 seta sbar_columns default

Modified: trunk/data/qcsrc/client/mapvoting.qc
===================================================================
--- trunk/data/qcsrc/client/mapvoting.qc	2009-02-06 09:08:56 UTC (rev 5774)
+++ trunk/data/qcsrc/client/mapvoting.qc	2009-02-06 09:13:03 UTC (rev 5775)
@@ -133,7 +133,7 @@
 		ymax = vid_conheight - ymin;
 
 	drawfont = sbar_bigfont;
-	sbar_fontsize = Sbar_GetFontsize();
+	sbar_fontsize = Sbar_GetFontsize("sbar_fontsize");
 
 	pos_y = ymin;
 	pos_z = 0;

Modified: trunk/data/qcsrc/client/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/client/miscfunctions.qc	2009-02-06 09:08:56 UTC (rev 5774)
+++ trunk/data/qcsrc/client/miscfunctions.qc	2009-02-06 09:13:03 UTC (rev 5775)
@@ -205,12 +205,12 @@
 		csqc_flags |= CSQC_FLAG_COLORCODES;
 }
 
-vector Sbar_GetFontsize()
+vector Sbar_GetFontsize(string cvarname)
 {
 	if(csqc_flags & CSQC_FLAG_READPICTURE)
 	{
 		vector v;
-		v = stov(cvar_string("sbar_fontsize"));
+		v = stov(cvar_string(cvarname));
 		if(v_x == 0)
 			v = '8 8 0';
 		if(v_y == 0)

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-02-06 09:08:56 UTC (rev 5774)
+++ trunk/data/qcsrc/client/sbar.qc	2009-02-06 09:13:03 UTC (rev 5775)
@@ -1509,12 +1509,14 @@
 float centerprint_expire;
 float centerprint_num;
 float centerprint_offset_hint;
-vector centerprint_fontsize = '11 11 0';
+vector centerprint_fontsize;
 
 void centerprint(string strMessage)
 {
 	float i, j, n, hcount;
 	string s;
+
+	centerprint_fontsize = Sbar_GetFontSize("scr_centersize");
 	
 	// delete old centerprint messages
 	for (i=0; i<centerprint_num; ++i)
@@ -1690,7 +1692,7 @@
 	vector o; o = '1 0 0' * vid_conwidth;
 	string s;
 
-	sbar_fontsize = Sbar_GetFontsize();
+	sbar_fontsize = Sbar_GetFontsize("sbar_fontsize");
 	
 	if(spectatee_status)
 	{