]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
that was stupidly named...
authorSamual Lenks <samual@xonotic.org>
Sun, 24 Feb 2013 07:26:28 +0000 (02:26 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 24 Feb 2013 07:26:28 +0000 (02:26 -0500)
qcsrc/client/hud.qc
qcsrc/client/hud.qh

index 6a7b6595452c2fa7ee6e95a6ff55a89b2f55ad1f..a56307e75801190e548d90a05458485bff02096c 100644 (file)
@@ -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 != "")
index 8ea7c5e812e1b96f8e177b8c8b964a392a8c1b9b..90ece36ac0d77117d47fe83970f40c36585bebdd 100644 (file)
@@ -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);