From: terencehill <piuntn@gmail.com>
Date: Thu, 19 May 2011 13:20:10 +0000 (+0200)
Subject: Optimize centerprint drawing
X-Git-Tag: xonotic-v0.5.0~233
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14efa39eaddeb8adf87192ad101f1262168ecad0;p=xonotic%2Fxonotic-data.pk3dir.git

Optimize centerprint drawing
- set drawfontscale before drawing all the lines, rather than for each line
- when a line isn't resized (sz == 1) use the previously calculated width (centerprint_width[i]) rather than calculate it again at every frame
- network warning message in ca once per second, message is still visible all the time
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 91256b9c5..848d069f6 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -302,11 +302,14 @@ void HUD_DrawCenterPrint (void)
 		centerprint_start_y = scoreboard_bottom + centerprint_fontsize_y;
 
 	pos = centerprint_start;
+	drawfontscale = sz * '1 1 0';
 	for (i=0; i<centerprint_num; i = i + 1)
 	{
 		ts = centerprint_messages[i];
-		drawfontscale = sz * '1 1 0';
-		pos_x = (vid_conwidth - stringwidth(ts, TRUE, centerprint_fontsize)) * 0.5;
+		if (sz == 1)
+			pos_x = (vid_conwidth - centerprint_width[i]) * 0.5;
+		else
+			pos_x = (vid_conwidth - stringwidth(ts, TRUE, centerprint_fontsize)) * 0.5;
 		if (ts != "")
 		{
 			drawcolorcodedstring(pos + '0 1 0' * (1 - sz) * 0.5 *centerprint_fontsize_y, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
@@ -315,8 +318,8 @@ void HUD_DrawCenterPrint (void)
 		else
 			// half height for empty lines looks better
 			pos_y = pos_y + sz * centerprint_fontsize_y * 0.5;
-		drawfontscale = '1 1 0';
 	}
+	drawfontscale = '1 1 0';
 }
 
 void drawstringright(vector position, string text, vector scale, vector rgb, float alpha, float flag)
diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index a58ccb2a5..681e86fa0 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -375,6 +375,7 @@ void count_alive_players()
  *
  * Gets called in StartFrame()
  */
+float warntime;
 void Spawnqueue_Check()
 {
 	count_spawned_players();
@@ -392,8 +393,12 @@ void Spawnqueue_Check()
 			reset_map(TRUE);
 		}
 		else if(ca_players < required_ca_players) {
-			FOR_EACH_PLAYER(self)
-				centerprint(self, strcat("^1Need at least 1 player in each team to play CA", "^7\n"));
+			if (time > warntime)
+			{
+				FOR_EACH_PLAYER(self)
+					centerprint(self, strcat("^1Need at least 1 player in each team to play CA", "^7\n"));
+				warntime = time + 1;
+			}
 			return;
 		}
 		else if(!next_round) {