From: Samual Lenks <samual@xonotic.org>
Date: Mon, 4 Mar 2013 02:14:18 +0000 (-0500)
Subject: Long lines BEGONE!
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41f3c294c3b6b052696f49dcca15cc690963a17d;p=xonotic%2Fxonotic-data.pk3dir.git

Long lines BEGONE!
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 53d547bfc..310423746 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -259,7 +259,12 @@ void LogDeath(string mode, float deathtype, entity killer, entity killed)
 	GameLogEcho(s);
 }
 
-void Obituary_SpecialDeath(entity notif_target, float murder, float deathtype, string s1, string s2, string s3, float f1, float f2, float f3)
+void Obituary_SpecialDeath(
+	entity notif_target,
+	float murder,
+	float deathtype,
+	string s1, string s2, string s3,
+	float f1, float f2, float f3)
 {
 	if(DEATH_ISSPECIAL(deathtype))
 	{
@@ -270,16 +275,44 @@ void Obituary_SpecialDeath(entity notif_target, float murder, float deathtype, s
 		{
 			if(deathent.death_msgmurder)
 			{
-				Send_Notification_WOVA(NOTIF_ONE, notif_target, MSG_MULTI, deathent.death_msgmurder.nent_id, s1, s2, s3, "", f1, f2, f3, 0);
-				Send_Notification_WOVA(NOTIF_ALL_EXCEPT, notif_target, MSG_INFO, deathent.death_msgmurder.nent_msginfo.nent_id, s1, s2, s3, "", f1, f2, f3, 0);
+				Send_Notification_WOVA(
+					NOTIF_ONE,
+					notif_target,
+					MSG_MULTI,
+					deathent.death_msgmurder.nent_id,
+					s1, s2, s3, "",
+					f1, f2, f3, 0
+				);
+				Send_Notification_WOVA(
+					NOTIF_ALL_EXCEPT,
+					notif_target,
+					MSG_INFO,
+					deathent.death_msgmurder.nent_msginfo.nent_id,
+					s1, s2, s3, "",
+					f1, f2, f3, 0
+				);
 			}
 		}
 		else
 		{
 			if(deathent.death_msgself)
 			{
-				Send_Notification_WOVA(NOTIF_ONE, notif_target, MSG_MULTI, deathent.death_msgself.nent_id, s1, s2, s3, "", f1, f2, f3, 0);
-				Send_Notification_WOVA(NOTIF_ALL_EXCEPT, notif_target, MSG_INFO, deathent.death_msgself.nent_msginfo.nent_id, s1, s2, s3, "", f1, f2, f3, 0);
+				Send_Notification_WOVA(
+					NOTIF_ONE,
+					notif_target,
+					MSG_MULTI,
+					deathent.death_msgself.nent_id,
+					s1, s2, s3, "",
+					f1, f2, f3, 0
+				);
+				Send_Notification_WOVA(
+					NOTIF_ALL_EXCEPT,
+					notif_target,
+					MSG_INFO,
+					deathent.death_msgself.nent_msginfo.nent_id,
+					s1, s2, s3, "",
+					f1, f2, f3, 0
+				);
 			}
 		}
 	}
@@ -287,7 +320,12 @@ void Obituary_SpecialDeath(entity notif_target, float murder, float deathtype, s
 }
 
 float w_deathtype;
-float Obituary_WeaponDeath(entity notif_target, float murder, float deathtype, string s1, string s2, string s3, float f1, float f2)
+float Obituary_WeaponDeath(
+	entity notif_target,
+	float murder,
+	float deathtype,
+	string s1, string s2, string s3,
+	float f1, float f2)
 {
 	float death_weapon = DEATH_WEAPONOF(deathtype);
 	if(death_weapon)
@@ -298,8 +336,22 @@ float Obituary_WeaponDeath(entity notif_target, float murder, float deathtype, s
 
 		if(death_message)
 		{
-			Send_Notification_WOVA(NOTIF_ONE, notif_target, MSG_MULTI, death_message, s1, s2, s3, "", f1, f2, 0, 0);
-			Send_Notification_WOVA(NOTIF_ALL_EXCEPT, notif_target, MSG_INFO, msg_multi_notifs[death_message - 1].nent_msginfo.nent_id, s1, s2, s3, "", f1, f2, 0, 0);
+			Send_Notification_WOVA(
+				NOTIF_ONE,
+				notif_target,
+				MSG_MULTI,
+				death_message,
+				s1, s2, s3, "",
+				f1, f2, 0, 0
+			);
+			Send_Notification_WOVA(
+				NOTIF_ALL_EXCEPT,
+				notif_target,
+				MSG_INFO,
+				msg_multi_notifs[death_message - 1].nent_msginfo.nent_id,
+				s1, s2, s3, "",
+				f1, f2, 0, 0
+			);
 		}
 		else
 		{