Merge branch 'master' into fruitiex/gamemode_freezetag

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 22fd92493c557e98c9583fae0c18c4b1c03ae44f..93d435924454a9812bf348349f3e512916182d83 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2622,7 +2622,7 @@ void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float
        --kn_index;
        if (kn_index == -1)
                kn_index = KN_MAX_ENTRIES-1;
-       killnotify_times[kn_index] = time; // -1 indicates the message is deleted
+       killnotify_times[kn_index] = time;
        killnotify_deathtype[kn_index] = wpn;
        killnotify_actiontype[kn_index] = actiontype;
        if(killnotify_attackers[kn_index])
@@ -3148,9 +3148,6 @@ void HUD_Notify (void)
                if (j == KN_MAX_ENTRIES)
                        j = 0;
 
-               if (killnotify_times[j] == -1)
-                       break;
-
                if(killnotify_times[j] + when > time)
                        a = 1;
                else if(fadetime)
@@ -3158,13 +3155,11 @@ void HUD_Notify (void)
                        a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1);
                        if(!a)
                        {
-                               killnotify_times[j] = -1;
                                break;
                        }
                }
                else
                {
-                       killnotify_times[j] = -1;
                        break;
                }
 
@@ -4520,7 +4515,7 @@ void HUD_ModIcons(void)
        if(!autocvar_hud_panel_modicons && !autocvar__hud_configure)
                return;
 
-       if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && !autocvar__hud_configure)
+       if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_FREEZETAG && !autocvar__hud_configure)
                return;
 
        active_panel = HUD_PANEL_MODICONS;
@@ -4557,7 +4552,7 @@ void HUD_ModIcons(void)
                HUD_Mod_NexBall(pos, mySize);
        else if(gametype == GAME_CTS || gametype == GAME_RACE)
                HUD_Mod_Race(pos, mySize);
-       else if(gametype == GAME_CA)
+       else if(gametype == GAME_CA || gametype == GAME_FREEZETAG)
                HUD_Mod_CA(pos, mySize);
 }