From: Samual <samual@xonotic.org>
Date: Tue, 18 Oct 2011 15:15:14 +0000 (-0400)
Subject: Global Announcer_Play(string) function
X-Git-Tag: xonotic-v0.6.0~35^2~66^2~2^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b0d08fe01727ca095d4c5247dee02dc4e079408;p=xonotic%2Fxonotic-data.pk3dir.git

Global Announcer_Play(string) function
---

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 81a04caf0..c9593f344 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -1377,7 +1377,7 @@ float CSQC_Parse_TempEntity()
 			bHandled = true;
 			break;
 		case TE_CSQC_ANNOUNCE:
-			Net_Announcer(ReadString());
+			Announcer_Play(ReadString());
 			bHandled = true;
 			break;
 		case TE_CSQC_KILLNOTIFY:
diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 0b404edab..0d64d6535 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,6 +1,15 @@
-void Net_Announcer(string announce_snd)
+float previous_announcement_time;
+string previous_announcement;
+
+void Announcer_Play(string announcement)
 {
-  sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/", announce_snd, ".wav"), VOL_BASEVOICE, ATTN_NONE);
+  if((announcement != previous_announcement) || (time >= (previous_announcement_time + 5)))
+  {
+    sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/", announcement, ".wav"), VOL_BASEVOICE, ATTN_NONE);
+    
+    previous_announcement = announcement;
+    previous_announcement_time = time;
+  }
 }
 
 /**