From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 21 Dec 2012 11:19:25 +0000 (+0100)
Subject: MSG_ALL, SVC_TEMPENTITY is bad
X-Git-Tag: xonotic-v0.7.0~165
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a8d6f3b7ae934a309483c4a95b4e910d15e32090;p=xonotic%2Fxonotic-data.pk3dir.git

MSG_ALL, SVC_TEMPENTITY is bad

use MSG_BROADCAST

otherwise clients not yet connected fully (still loading maps or
csprogs) get kicked off because of not being able to
parse the messages.
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 627cf6c6b..900217c95 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -7,9 +7,9 @@ void send_CSQC_teamnagger() {
 }
 
 void Announce(string snd) {
-	WriteByte(MSG_ALL, SVC_TEMPENTITY);
-	WriteByte(MSG_ALL, TE_CSQC_ANNOUNCE);
-	WriteString(MSG_ALL, snd);
+	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
+	WriteByte(MSG_BROADCAST, TE_CSQC_ANNOUNCE);
+	WriteString(MSG_BROADCAST, snd);
 }
 
 void AnnounceTo(entity e, string snd) {
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 189cd9b05..2e5d9f4d6 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -310,13 +310,13 @@ void LogDeath(string mode, float deathtype, entity killer, entity killed)
 
 void Send_KillNotification (string s1, string s2, string s3, float msg, float type)
 {
-	WriteByte(MSG_ALL, SVC_TEMPENTITY);
-	WriteByte(MSG_ALL, TE_CSQC_KILLNOTIFY);
-	WriteString(MSG_ALL, s1);
-	WriteString(MSG_ALL, s2);
-	WriteString(MSG_ALL, s3);
-	WriteShort(MSG_ALL, msg);
-	WriteByte(MSG_ALL, type);
+	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
+	WriteByte(MSG_BROADCAST, TE_CSQC_KILLNOTIFY);
+	WriteString(MSG_BROADCAST, s1);
+	WriteString(MSG_BROADCAST, s2);
+	WriteString(MSG_BROADCAST, s3);
+	WriteShort(MSG_BROADCAST, msg);
+	WriteByte(MSG_BROADCAST, type);
 }
 
 // Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases)