From: Samual Lenks <samual@xonotic.org>
Date: Thu, 13 Dec 2012 08:18:39 +0000 (-0500)
Subject: Attempt to also make the server network the death messages properly
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~361
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db7d7d8110d801e78311d7dc0bbdb6b4eb7d5913;p=xonotic%2Fxonotic-data.pk3dir.git

Attempt to also make the server network the death messages properly
---

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; \
 			} }