Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/arena_gamemode

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index b2da5df1a53b3ff1ae4d755fe10de177a4719e7a..13cbab046785fd62d4eae33b97d0d26ad9f7fdb5 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -306,13 +306,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)
@@ -335,7 +335,7 @@ void Send_CSQC_KillCenterprint(entity e, string s1, string s2, float msg, float
 void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 {
        string  s, a, msg;
-       float w, type;
+       float type;
 
        if (targ.classname == "player")
        {
@@ -369,7 +369,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        deathtype = KILL_TEAM_BLUE;
                        }
 
-                       Send_KillNotification(s, msg, ftos(w), deathtype, MSG_SUICIDE);
+                       Send_KillNotification(s, msg, "", deathtype, MSG_SUICIDE);
                }
                else if (attacker.classname == "player")
                {