r2664 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: lordhavoc
Date: 2007-05-22 23:57:44 -0400 (Tue, 22 May 2007)
New Revision: 2664

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
cleaned up teamplay damage checks and fixed teamplay 4 damage to
non-players to block damage like teamplay 3


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2007-05-23 03:50:05 UTC (rev 2663)
+++ trunk/data/qcsrc/server/g_damage.qc	2007-05-23 03:57:44 UTC (rev 2664)
@@ -341,33 +341,34 @@
 
 	// nullify damage if teamplay is on
 	if(deathtype != DEATH_TELEFRAG)
+	if(attacker.team == targ.team)
+	if(attacker.classname == "player")
 	{
 		if(teamplay == 1)
-			if(attacker.team)
-				if(attacker.team == targ.team)
+			damage = 0;
+		else if(attacker != targ)
+		{
+			if(teamplay == 3)
+				damage = 0;
+			else if(teamplay == 4)
+			{
+				if(targ.classname == "player" && targ.deadflag == DEAD_NO)
+				{
+					mirrordamage = cvar("g_mirrordamage") * damage;
+					mirrorforce = cvar("g_mirrordamage") * vlen(force);
+					if(cvar("g_minstagib"))
+					{
+						if(cvar("g_friendlyfire") == 0)
+							damage = 0;
+					}
+					else
+						damage = cvar("g_friendlyfire") * damage;
+					// mirrordamage will be used LATER
+				}
+				else
 					damage = 0;
-		if(teamplay == 3)
-			if(attacker != targ)
-				if(attacker.team)
-					if(attacker.team == targ.team)
-						damage = 0;
-		if(teamplay == 4)
-			if(attacker != targ)
-				if(attacker.team == targ.team)
-					if(attacker.classname == "player")
-						if((targ.classname == "player") && (targ.health > 0))
-						{
-							mirrordamage = cvar("g_mirrordamage") * damage;
-							mirrorforce = cvar("g_mirrordamage") * vlen(force);
-							if(cvar("g_minstagib"))
-							{
-								if(cvar("g_friendlyfire") == 0)
-									damage = 0;
-							}
-							else
-								damage = cvar("g_friendlyfire") * damage;
-							// mirrordamage will be used LATER
-						}
+			}
+		}
 	}
 
 	if(cvar("g_lms"))