From: Samual Lenks <samual@xonotic.org>
Date: Sun, 24 Feb 2013 07:26:28 +0000 (-0500)
Subject: that was stupidly named...
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~135
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5241e58e122f0bd7945b9a33a44ab14d8618bb2;p=xonotic%2Fxonotic-data.pk3dir.git

that was stupidly named...
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 6a7b65954..a56307e75 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1625,19 +1625,19 @@ void HUD_Notify_Push(string icon, string attacker, string victim)
 	{
 		--kn_index;
 		if (kn_index == -1) { kn_index = KN_MAX_ENTRIES-1; }
-		killnotify_times[kn_index] = time;
+		notify_times[kn_index] = time;
 
 		// icon
-		if(killnotify_icon[kn_index]) { strunzone(killnotify_icon[kn_index]); }
-		killnotify_icon[kn_index] = strzone(icon);
+		if(notify_icon[kn_index]) { strunzone(notify_icon[kn_index]); }
+		notify_icon[kn_index] = strzone(icon);
 
 		// attacker
-		if(killnotify_attackers[kn_index]) { strunzone(killnotify_attackers[kn_index]); }
-		killnotify_attackers[kn_index] = strzone(attacker);
+		if(notify_attackers[kn_index]) { strunzone(notify_attackers[kn_index]); }
+		notify_attackers[kn_index] = strzone(attacker);
 
 		// victim
-		if(killnotify_victims[kn_index]) { strunzone(killnotify_victims[kn_index]); }
-		killnotify_victims[kn_index] = strzone(victim);
+		if(notify_victims[kn_index]) { strunzone(notify_victims[kn_index]); }
+		notify_victims[kn_index] = strzone(victim);
 	}
 }
 
@@ -1714,11 +1714,11 @@ void HUD_Notify(void)
 			if (j == KN_MAX_ENTRIES)
 				j = 0;
 
-			if(killnotify_times[j] + when > time)
+			if(notify_times[j] + when > time)
 				a = 1;
 			else if(fadetime)
 			{
-				a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1);
+				a = bound(0, (notify_times[j] + when + fadetime - time) / fadetime, 1);
 				if(!a)
 				{
 					break;
@@ -1729,12 +1729,12 @@ void HUD_Notify(void)
 				break;
 			}
 			
-			attacker = killnotify_attackers[j];
-			victim = killnotify_victims[j];
-			icon = killnotify_icon[j];
+			attacker = notify_attackers[j];
+			victim = notify_victims[j];
+			icon = notify_icon[j];
 		}
 
-		//type = killnotify_deathtype[j];
+		//type = notify_deathtype[j];
 		//w = DEATH_WEAPONOF(type);
 
 		if(icon != "")
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 8ea7c5e81..90ece36ac 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -344,8 +344,8 @@ switch(id) { \
 #define KN_MAX_ENTRIES 10
 
 float kn_index;
-float killnotify_times[KN_MAX_ENTRIES];
-string killnotify_icon[KN_MAX_ENTRIES];
-string killnotify_attackers[KN_MAX_ENTRIES];
-string killnotify_victims[KN_MAX_ENTRIES];
+float notify_times[KN_MAX_ENTRIES];
+string notify_icon[KN_MAX_ENTRIES];
+string notify_attackers[KN_MAX_ENTRIES];
+string notify_victims[KN_MAX_ENTRIES];
 void HUD_Notify_Push(string icon, string attacker, string victim);