r3943 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-27 06:01:40 -0400 (Sun, 27 Jul 2008)
New Revision: 3943

Modified:
   trunk/data/qcsrc/client/main.qh
   trunk/data/qcsrc/client/mapvoting.qc
   trunk/data/qcsrc/client/miscfunctions.qc
   trunk/data/qcsrc/client/sbar.qc
Log:
add sbar_bigfont; use that for headlines


Modified: trunk/data/qcsrc/client/main.qh
===================================================================
--- trunk/data/qcsrc/client/main.qh	2008-07-27 09:57:43 UTC (rev 3942)
+++ trunk/data/qcsrc/client/main.qh	2008-07-27 10:01:40 UTC (rev 3943)
@@ -82,6 +82,7 @@
 float sbar_num_fields;
 
 float sbar_font;
+float sbar_bigfont;
 
 string scores_label[MAX_SCORE];
 float scores_flags[MAX_SCORE];

Modified: trunk/data/qcsrc/client/mapvoting.qc
===================================================================
--- trunk/data/qcsrc/client/mapvoting.qc	2008-07-27 09:57:43 UTC (rev 3942)
+++ trunk/data/qcsrc/client/mapvoting.qc	2008-07-27 10:01:40 UTC (rev 3943)
@@ -116,7 +116,7 @@
 	if(i >= 0 || ymax < (vid_conheight*0.5))
 		ymax = vid_conheight - ymin;
 
-	drawfont = sbar_font;
+	drawfont = sbar_bigfont;
 	sbar_fontsize = stov(cvar_string("sbar_fontsize"));
 	if(sbar_fontsize_x == 0)
 		sbar_fontsize = '8 8 0';
@@ -135,6 +135,8 @@
 	drawstring(pos, map, '16 16 0', '0 1 0', 1, DRAWFLAG_NORMAL);
 	pos_y += 22;
 	pos_x = xmin;
+
+	drawfont = sbar_font;
 	
 	isize = (ymax - pos_y - mv_num_maps*10) / mv_num_maps;
 	isize = min(isize, 64);

Modified: trunk/data/qcsrc/client/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/client/miscfunctions.qc	2008-07-27 09:57:43 UTC (rev 3942)
+++ trunk/data/qcsrc/client/miscfunctions.qc	2008-07-27 10:01:40 UTC (rev 3943)
@@ -142,10 +142,12 @@
 	{
 		stringwidth = stringwidth_engine;
 		sbar_font = FONT_USER+1;
+		sbar_bigfont = FONT_USER+2;
 		csqc_flags |= CSQC_FLAG_READPICTURE;
 	} else {
 		stringwidth = stringwidth_oldfont;
 		sbar_font = FONT_DEFAULT;
+		sbar_bigfont = FONT_DEFAULT;
 	}
 }
 

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-07-27 09:57:43 UTC (rev 3942)
+++ trunk/data/qcsrc/client/sbar.qc	2008-07-27 10:01:40 UTC (rev 3943)
@@ -727,7 +727,7 @@
 	pos_z = 0;
 
 	// Heading
-	drawfont = sbar_font;
+	drawfont = sbar_bigfont;
 	pos_x = center_x - stringwidth("Scoreboard", TRUE)*0.5*24;
 	drawstring(pos, "Scoreboard", '24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
 	pos_x = xmin;
@@ -738,6 +738,8 @@
 	tmp_y = sbar_fontsize_y;
 	drawfill(pos - '1 1 0', tmp + '2 2 0', '0.5 0.5 0.5', 0.5, DRAWFLAG_NORMAL);
 	
+	drawfont = sbar_font;
+
 	for(i = 0; i < sbar_num_fields; ++i)
 	{
 		if(sbar_field[i] == SP_SEPARATOR)