From: Samual Lenks Date: Mon, 26 Aug 2013 03:08:33 +0000 (-0400) Subject: Fix some other things X-Git-Tag: xonotic-v0.8.0~341^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69baf80f2b53994c0181240bd39ad878ac87ca7e;p=xonotic%2Fxonotic-data.pk3dir.git Fix some other things --- diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc index 4693dfb4c..c2420d443 100644 --- 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( + #ifdef NOTIFICATIONS_DEBUG "%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 @@ -1908,8 +1913,13 @@ 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 client.classname, Get_Notif_TypeName(net_type), notif.nent_name diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index ad5cafc4d..1228a9c4a 100644 --- 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 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);