From: Severin Meyer <sev.ch@web.de>
Date: Sun, 21 Sep 2014 12:48:06 +0000 (+0200)
Subject: Optimize HUD_Notify() by adding a counter for a quick-return conditional. Also simpli... 
X-Git-Tag: xonotic-v0.8.0~178^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d55a162720ed2cc24caaefae8e5648a14ad8fc8d;p=xonotic%2Fxonotic-data.pk3dir.git

Optimize HUD_Notify() by adding a counter for a quick-return conditional. Also simplify the HUD editor representation.
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 503075e52..0f43461ce 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1604,6 +1604,7 @@ void HUD_Notify_Push(string icon, string attacker, string victim)
 	if (icon == "")
 		return;
 
+	++notify_count;
 	--notify_index;
 
 	if (notify_index == -1)
@@ -1612,8 +1613,10 @@ void HUD_Notify_Push(string icon, string attacker, string victim)
 	// Free old strings
 	if (notify_attackers[notify_index])
 		strunzone(notify_attackers[notify_index]);
+
 	if (notify_victims[notify_index])
 		strunzone(notify_victims[notify_index]);
+
 	if (notify_icons[notify_index])
 		strunzone(notify_icons[notify_index]);
 
@@ -1645,6 +1648,10 @@ void HUD_Notify(void)
 	HUD_Panel_UpdateCvars();
 	HUD_Panel_DrawBg(1);
 
+	if (!autocvar__hud_configure)
+		if (notify_count == 0)
+			return;
+
 	vector pos, size;
 	pos  = panel_pos;
 	size = panel_size;
@@ -1673,7 +1680,7 @@ void HUD_Notify(void)
 
 	vector attacker_pos, victim_pos, icon_pos;
 	string attacker, victim, icon;
-	float i, j, step, limit, alpha;
+	float i, j, count, step, limit, alpha;
 
 	if (autocvar_hud_panel_notify_flip)
 	{
@@ -1690,19 +1697,14 @@ void HUD_Notify(void)
 		limit = -1;
 	}
 
-	for (j = notify_index; i != limit; i += step, ++j)
+	for (j = notify_index, count = 0; i != limit; i += step, ++j, ++count)
 	{
 		if(autocvar__hud_configure)
 		{
-			if (step == +1)
-				alpha = i;
-			else // inverse order
-				alpha = entry_count - 1 - i;
-
-			attacker = textShortenToWidth(sprintf(_("Player %d"), alpha+1), 0.48 * size_x - entry_height, font_size, stringwidth_colors);
-			victim = textShortenToWidth(sprintf(_("Player %d"), alpha+2), 0.48 * size_x - entry_height, font_size, stringwidth_colors);
-			icon = strcat("weapon", get_weaponinfo(WEP_FIRST + mod(floor(alpha*2.4), WEP_LAST)).netname);
-			alpha = bound(0, (fade_start - alpha) / 4, 1);
+			attacker = sprintf(_("Player %d"), count + 1);
+			victim = sprintf(_("Player %d"), count + 2);
+			icon = strcat("weapon", get_weaponinfo(min(WEP_FIRST + count * 2, WEP_LAST)).netname);
+			alpha = bound(0, 1.2 - count / entry_count, 1);
 		}
 		else
 		{
@@ -1744,6 +1746,8 @@ void HUD_Notify(void)
 			}
 		}
 	}
+
+	notify_count = count;
 }
 
 // Timer (#5)
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 3e4aee95c..26e9480ca 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -342,6 +342,7 @@ HUD_Panel_GetBorder() \
 #define NOTIFY_ICON_MARGIN 0.02
 
 float notify_index;
+float notify_count;
 float notify_times[NOTIFY_MAX_ENTRIES];
 string notify_attackers[NOTIFY_MAX_ENTRIES];
 string notify_victims[NOTIFY_MAX_ENTRIES];