Logging macros

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

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 31f7e864c0ac4a5579dff63d86a9ec49b6d3f205..03005da3432bfea9fe1778c78f1eb1746b0fcdeb 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -5,7 +5,6 @@
     #include "../dpdefs/dpextensions.qh"
     #include "constants.qh"
     #include "teams.qh"
-    #include "counting.qh"
     #include "../server/autocvars.qh"
     #include "../server/constants.qh"
     #include "../server/defs.qh"
@@ -1961,6 +1960,12 @@ void Send_Notification(
 
        if((notif.nent_stringcount + notif.nent_floatcount) > count)
        {
+               string s =
+               #ifdef NOTIFICATIONS_DEBUG
+               Get_Notif_BroadcastName(broadcast);
+               #else
+               ftos(broadcast);
+               #endif
                backtrace(sprintf(
                        strcat(
                                "Not enough arguments for Send_Notification(%s, ...)! ",
@@ -1968,13 +1973,8 @@ void Send_Notification(
                                "Check the definition and function call for accuracy...?\n"
                        ),
                        sprintf(
-                               #ifdef NOTIFICATIONS_DEBUG
                                "%s, '%s', %s, %s",
-                               Get_Notif_BroadcastName(broadcast),
-                               #else
-                               "%d, '%s', %s, %s",
-                               broadcast,
-                               #endif
+                               s,
                                client.classname,
                                Get_Notif_TypeName(net_type),
                                notif.nent_name
@@ -1987,6 +1987,12 @@ void Send_Notification(
        }
        else if((notif.nent_stringcount + notif.nent_floatcount) < count)
        {
+               string s =
+               #ifdef NOTIFICATIONS_DEBUG
+               Get_Notif_BroadcastName(broadcast);
+               #else
+               ftos(broadcast);
+               #endif
                backtrace(sprintf(
                        strcat(
                                "Too many arguments for Send_Notification(%s, ...)! ",
@@ -1994,13 +2000,8 @@ void Send_Notification(
                                "Check the definition and function call for accuracy...?\n"
                        ),
                        sprintf(
-                               #ifdef NOTIFICATIONS_DEBUG
                                "%s, '%s', %s, %s",
-                               Get_Notif_BroadcastName(broadcast),
-                               #else
-                               "%d, '%s', %s, %s",
-                               broadcast,
-                               #endif
+                               s,
                                client.classname,
                                Get_Notif_TypeName(net_type),
                                notif.nent_name