Fix some other things

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 4693dfb4c059644f20f7ea029befe1e4bd91671b..c2420d4435ba7bdc7ca4647edcbfb015164ba9eb 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -1887,8 +1887,13 @@ void Send_Notification(
                                "Check the definition and function call for accuracy...?\n"
                        ),
                        sprintf(
                                "Check the definition and function call for accuracy...?\n"
                        ),
                        sprintf(

+                               #ifdef NOTIFICATIONS_DEBUG

                                "%s, '%s', %s, %s",
                                Get_Notif_BroadcastName(broadcast),
                                "%s, '%s', %s, %s",
                                Get_Notif_BroadcastName(broadcast),

+                               #else
+                               "%d, '%s', %s, %s",
+                               broadcast,
+                               #endif

                                client.classname,
                                Get_Notif_TypeName(net_type),
                                notif.nent_name
                                client.classname,
                                Get_Notif_TypeName(net_type),
                                notif.nent_name


@@ -1908,8 +1913,13 @@ void Send_Notification(
                                "Check the definition and function call for accuracy...?\n"
                        ),
                        sprintf(
                                "Check the definition and function call for accuracy...?\n"
                        ),
                        sprintf(

+                               #ifdef NOTIFICATIONS_DEBUG

                                "%s, '%s', %s, %s",
                                Get_Notif_BroadcastName(broadcast),
                                "%s, '%s', %s, %s",
                                Get_Notif_BroadcastName(broadcast),

+                               #else
+                               "%d, '%s', %s, %s",
+                               broadcast,
+                               #endif

                                client.classname,
                                Get_Notif_TypeName(net_type),
                                notif.nent_name
                                client.classname,
                                Get_Notif_TypeName(net_type),
                                notif.nent_name

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index ad5cafc4d5bc4f191e26c673601297b6c950680d..1228a9c4a40446bd9021470c3f56775b691414e1 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -101,9 +101,6 @@ float prev_soundtime;
 #define NOTIF_ALL 5
 #define NOTIF_ALL_EXCEPT 6
 
 #define NOTIF_ALL 5
 #define NOTIF_ALL_EXCEPT 6
 

-#define IFSTR(num) ((num < notif.nent_stringcount) ? ...(num, string) : "")
-#define IFFL(num) ((((notif.nent_stringcount-1) + num) < count) ? ...(((notif.nent_stringcount-1) + num), float) : 0)
-

 void Kill_Notification(
        float broadcast, entity client,
        float net_type, float net_name);
 void Kill_Notification(
        float broadcast, entity client,
        float net_type, float net_name);