Merge branch 'master' into TimePath/waypointsprites

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / notifications.qc

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index a406df52419dc71d1bdf985e7aa963e83b988fa1..31f7e864c0ac4a5579dff63d86a9ec49b6d3f205 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -1561,6 +1561,14 @@ void Local_Notification(int net_type, int net_name, ...count)
                        #ifdef CSQC
                        if(notif.nent_icon != "")
                        {
+                               if ( notif.nent_iconargs != "" )
+                               {
+                                       notif.nent_icon = Local_Notification_sprintf(
+                                               notif.nent_icon,notif.nent_iconargs,
+                                               s1, s2, s3, s4, f1, f2, f3, f4);
+                                       // remove the newline added by Local_Notification_sprintf
+                                       notif.nent_icon = strzone(substring(notif.nent_icon,0,strlen(notif.nent_icon)-1));
+                               }
                                Local_Notification_HUD_Notify_Push(
                                        notif.nent_icon,
                                        notif.nent_hudargs,