From 906fa13eab700600f454a708b092bb020f63acf1 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sat, 9 Aug 2008 23:24:29 +0000
Subject: [PATCH] forgot this file

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4085 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/g_damage.qc | 38 +++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index 3675d85a9..198e92802 100644
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -513,32 +513,39 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 		// nullify damage if teamplay is on
 		if(deathtype != DEATH_TELEFRAG)
-		if(attacker.team == targ.team)
 		if(attacker.classname == "player")
 		{
-			if(teamplay == 1)
+			if(independent_players && targ != attacker)
+			{
 				damage = 0;
-			else if(attacker != targ)
+				force = '0 0 0';
+			}
+			else if(attacker.team == targ.team)
 			{
-				if(teamplay == 3)
+				if(teamplay == 1)
 					damage = 0;
-				else if(teamplay == 4)
+				else if(attacker != targ)
 				{
-					if(targ.classname == "player" && targ.deadflag == DEAD_NO)
+					if(teamplay == 3)
+						damage = 0;
+					else if(teamplay == 4)
 					{
-						mirrordamage = cvar("g_mirrordamage") * damage;
-						mirrorforce = cvar("g_mirrordamage") * vlen(force);
-						if(g_minstagib)
+						if(targ.classname == "player" && targ.deadflag == DEAD_NO)
 						{
-							if(cvar("g_friendlyfire") == 0)
-								damage = 0;
+							mirrordamage = cvar("g_mirrordamage") * damage;
+							mirrorforce = cvar("g_mirrordamage") * vlen(force);
+							if(g_minstagib)
+							{
+								if(cvar("g_friendlyfire") == 0)
+									damage = 0;
+							}
+							else
+								damage = cvar("g_friendlyfire") * damage;
+							// mirrordamage will be used LATER
 						}
 						else
-							damage = cvar("g_friendlyfire") * damage;
-						// mirrordamage will be used LATER
+							damage = 0;
 					}
-					else
-						damage = 0;
 				}
 			}
 		}
@@ -654,6 +661,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 		self.flags = self.flags - (self.flags & FL_ONGROUND);
 	}
 	// apply damage
+	if (damage != 0)
 	if (self.event_damage)
 		self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force);
 	self = oldself;
-- 
2.39.2