From: Samual Lenks <samual@xonotic.org>
Date: Sat, 23 Feb 2013 23:02:17 +0000 (-0500)
Subject: Strip out this junk from damage function
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~148
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c9a6cc55d72d08c84c3dfe98cf06c543280ae513;p=xonotic%2Fxonotic-data.pk3dir.git

Strip out this junk from damage function
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d954b9c3a..765953e6e 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -473,68 +473,6 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 				PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
 			}
 
-			/*if(notif_firstblood) // first blood, no kill sprees yet
-			{
-				if(targ.istypefrag)
-				{
-					if(attacker.FRAG_VERBOSE)
-						Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, targ.netname, -1, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
-					else
-						Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG_FIRST, targ.netname, -1);
-
-					if(targ.FRAG_VERBOSE)
-						Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, attacker.netname, -2, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
-					else
-						Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST, attacker.netname, -2);
-				}
-				else
-				{
-					if(attacker.FRAG_VERBOSE)
-						Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG_FIRST_VERBOSE, targ.netname, -1, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
-					else
-						Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG_FIRST, targ.netname, -1);
-
-					if(targ.FRAG_VERBOSE)
-						Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED_FIRST_VERBOSE, attacker.netname, -2, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
-					else
-						Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED_FIRST, attacker.netname, -2);
-				}
-
-				// -1 means firstblood
-				if not(Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, -1, -1))
-					Obituary_SpecialDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, -1, -1, 0);
-			}
-			else // normal frags, kill sprees listed
-			{
-				if(targ.istypefrag)
-				{
-					if(attacker.FRAG_VERBOSE)
-						Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE, targ.netname, attacker.killcount, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
-					else
-						Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG, targ.netname, attacker.killcount);
-
-					if(targ.FRAG_VERBOSE)
-						Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE, attacker.netname, 0, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
-					else
-						Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED, attacker.netname, 0);
-				}
-				else
-				{
-					if(attacker.FRAG_VERBOSE)
-						Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG_VERBOSE, targ.netname, attacker.killcount, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
-					else
-						Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG, targ.netname, attacker.killcount);
-
-					if(targ.FRAG_VERBOSE)
-						Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED_VERBOSE, attacker.netname, 0, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
-					else
-						Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED, attacker.netname, 0);
-				}
-
-				if not(Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, targ.killcount, attacker.killcount))
-					Obituary_SpecialDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, targ.killcount, attacker.killcount, 0);
-			}*/
-
 			float kill_count_to_attacker;
 			float kill_count_to_target;
 			if(notif_firstblood)