From 357bc80f55dae24629be97851789c2f26b7e3c4b Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Thu, 9 Sep 2010 19:18:18 +0300 Subject: [PATCH] Fix Nexuiz's "players hear bot announcers" bug --- data/qcsrc/server/cl_client.qc | 11 +++++++---- data/qcsrc/server/miscfunctions.qc | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 74ab85b1..ab172d4d 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -13,10 +13,13 @@ void Announce(string snd) { } void AnnounceTo(entity e, string snd) { - msg_entity = e; - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE); - WriteString(MSG_ONE, snd); + if (clienttype(e) == CLIENTTYPE_REAL) + { + msg_entity = e; + WriteByte(MSG_ONE, SVC_TEMPENTITY); + WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE); + WriteString(MSG_ONE, snd); + } } float ClientData_Send(entity to, float sf) diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 766b57c6..93e162b1 100644 --- 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) { //stuffcmd(e, strcat("play2 ", filename, "\n")); - msg_entity = e; - soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE); + if (clienttype(e) == CLIENTTYPE_REAL) + { + msg_entity = e; + soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE); + } } // use this one if you might be causing spam (e.g. from touch functions that might get called more than once per frame) -- 2.39.2