r4085 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-09 19:24:29 -0400 (Sat, 09 Aug 2008)
New Revision: 4085

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
forgot this file


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-08-09 23:24:16 UTC (rev 4084)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-08-09 23:24:29 UTC (rev 4085)
@@ -513,32 +513,39 @@
 
 		// 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 @@
 		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;