Fix Nexuiz's "players hear bot announcers" bug

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 74ab85b188ce39b2cfdfe543d4de1de8b83e23eb..ab172d4dec5921c8c038b3b6e0aa96f650a37781 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -13,10 +13,13 @@ void Announce(string snd) {
 }\r
 \r
 void AnnounceTo(entity e, string snd) {\r
-       msg_entity = e;\r
-       WriteByte(MSG_ONE, SVC_TEMPENTITY);\r
-       WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);\r
-       WriteString(MSG_ONE, snd);\r
+       if (clienttype(e) == CLIENTTYPE_REAL)\r
+       {\r
+               msg_entity = e;\r
+               WriteByte(MSG_ONE, SVC_TEMPENTITY);\r
+               WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);\r
+               WriteString(MSG_ONE, snd);\r
+       }\r
 }\r
 \r
 float ClientData_Send(entity to, float sf)\r

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 766b57c6bc11278f4f137374e1e1b7bfdc608659..93e162b1d5e2bf23361756b2741ae3dc59777d7c 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1262,8 +1262,11 @@ void stopsound(entity e, float chan)
 void play2(entity e, string filename)\r
 {\r
     //stuffcmd(e, strcat("play2 ", filename, "\n"));\r
-    msg_entity = e;\r
-    soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE);\r
+    if (clienttype(e) == CLIENTTYPE_REAL)\r
+    {\r
+        msg_entity = e;\r
+        soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE);\r
+    }\r
 }\r
 \r
 // use this one if you might be causing spam (e.g. from touch functions that might get called more than once per frame)\r