From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Tue, 29 Jun 2010 10:52:28 +0000 (+0300)
Subject: fix icon for DEATH_MIRRORDAMAGE
X-Git-Tag: xonotic-v0.1.0preview~457^2~55
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=687f506411293e8ae78438cc60d5eae456dbe433;p=xonotic%2Fxonotic-data.pk3dir.git

fix icon for DEATH_MIRRORDAMAGE
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 3431129c3..48cd14ee0 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -294,14 +294,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 				msg = ColoredTeamName(targ.team); // TODO: check if needed?
 			Send_CSQC_Centerprint(targ, msg, "", deathtype, MSG_SUICIDE);
 
-			// TODO: hmm?
-			/*
-				if (targ.killcount > 2)
-					bprint ("^1",s,"^1 faded after a ",ftos(targ.killcount)," point spree\n");
-			*/
-
-			// TODO: wut is this?
-			// givefrags for logging apparently?
 			if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
 			{
 				LogDeath("suicide", deathtype, targ, targ);
@@ -310,7 +302,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
 			if (targ.killcount > 2)
 				msg = ftos(targ.killcount);
-			if(teams_matter && attacker.team == targ.team)
+			if(teams_matter && deathtype == DEATH_MIRRORDAMAGE)
 			{
 				if(attacker.team == COLOR_TEAM1)
 					deathtype = KILL_TEAM_RED;
@@ -354,7 +346,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 				{
 					checkrules_firstblood = TRUE;
 					Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL);
-					// TODO: make these print at newline if they dont
+					// TODO: make these print a newline if they dont
 					Send_CSQC_Centerprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL);
 					Send_CSQC_Centerprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL);
 				}