Let announcer queue guess announcer length

diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index bd46f35d7aaeb3394c581fa8c2f9a71cbd9bf23d..5a73a17e4031fe3e2cf8c8060f60b9bb722e35e8 100644 (file)
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -98,7 +98,11 @@
 #define N_GNTLOFF 1
 #define N__ALWAYS 2
 
-#define ANNCE_DEFTIME 2
+// defaault time for announcer queue (time to wait before the next announcer is played)
+// -1 = bypass queue and play the announcer immediately
+// 0 = use the announcer sound length
+// >0 = use the specified time to wait
+#define ANNCE_DEFTIME 0
 
 #define MULTITEAM_ANNCE(prefix, defaultvalue, sound, channel, volume, position) \
     NOTIF_ADD_AUTOCVAR(ANNCE_##prefix, defaultvalue) \

diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc
index 685febf0fdfbdab915e8c516ca8baaef3e8502c0..c8bcb6a68df6c172b4c2812978dcc34be18ccf71 100644 (file)
--- a/qcsrc/common/notifications/all.qc
+++ b/qcsrc/common/notifications/all.qc
@@ -1200,7 +1200,8 @@ void Local_Notification_Queue_Add(MSG net_type, entity notif, float queue_time)
        if(queue_time == -1 || time > notif_queue_next_time) {
                // Run immediately
                Local_Notification_Queue_Run(net_type, notif);
-               notif_queue_next_time = time + queue_time;
+               if(queue_time >= 0)
+                       notif_queue_next_time = time + (queue_time == 0 ? soundlength(AnnouncerFilename(notif.nent_snd)) : queue_time);
        } else {
                // Put in queue
                if(notif_queue_length >= NOTIF_QUEUE_MAX) return;