Merge branch 'terencehill/uid2name_dialog' into 'master'

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

diff --git a/qcsrc/client/hud/panel/notify.qc b/qcsrc/client/hud/panel/notify.qc
index 821c993fafe30d1abcfe2001847e7c1adcb0008f..a5e923825a989fc13e9b76b9c077de5b4ce97c31 100644 (file)
--- a/qcsrc/client/hud/panel/notify.qc
+++ b/qcsrc/client/hud/panel/notify.qc
@@ -1,3 +1,4 @@
+#include "notify.qh"
 // Notification area (#4)
 
 void HUD_Notify_Push(string icon, string attacker, string victim)
@@ -47,6 +48,10 @@ void HUD_Notify()
                        return;
 
        HUD_Panel_UpdateCvars();
+       if (autocvar_hud_panel_notify_dynamichud)
+               HUD_Scale_Enable();
+       else
+               HUD_Scale_Disable();
        HUD_Panel_DrawBg(1);
 
        if (!autocvar__hud_configure)
@@ -106,7 +111,7 @@ void HUD_Notify()
                {
                        attacker = sprintf(_("Player %d"), count + 1);
                        victim = sprintf(_("Player %d"), count + 2);
-                       icon = get_weaponinfo(min(WEP_FIRST + count * 2, WEP_LAST)).model2;
+                       icon = Weapons_from(min(WEP_FIRST + count * 2, WEP_LAST)).model2;
                        alpha = bound(0, 1.2 - count / entry_count, 1);
                }
                else