From db7d7d8110d801e78311d7dc0bbdb6b4eb7d5913 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 13 Dec 2012 03:18:39 -0500 Subject: [PATCH] Attempt to also make the server network the death messages properly --- qcsrc/server/g_damage.qc | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index c705e2bc1..1573a8a3d 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -316,11 +316,24 @@ void Obituary_SpecialDeath(entity notif_target, float murder, float deathtype, s #define DEATHTYPE(name,msg_death_by,msg_death,position) \ { if(deathtype == max(0, name)) \ { \ - #if murder \ - if(max(0, msg_death_by)) { Send_Notification(notif_target, MSG_ONE, MSG_DEATH, msg_death_by, s1, s2, f1, f2, f3); ++handled; } \ - #else \ - if(max(0, msg_death)) { Send_Notification(notif_target, MSG_ONE, MSG_DEATH, msg_death, s1, s2, f1, f2, f3); ++handled; } \ - #endif \ + if(murder) \ + { \ + #if msg_death_by \ + { \ + Send_Notification(notif_target, MSG_ONE, MSG_DEATH, msg_death_by, s1, s2, f1, f2, f3); \ + Send_Notification_ToAll(notif_target, TRUE, MSG_INFO, INFO_##msg_death_by, s1, s2, f1, f2, f3); \ + ++handled; \ + } \ + #endif \ + } else { \ + #if msg_death \ + { \ + Send_Notification(notif_target, MSG_ONE, MSG_DEATH, msg_death, s1, s2, f1, f2, f3); \ + Send_Notification_ToAll(notif_target, TRUE, MSG_INFO, INFO_##msg_death, s1, s2, f1, f2, f3); \ + ++handled; \ + } \ + #endif \ + } \ ++hits; \ } } -- 2.39.2