r1885 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: kadaverjack
Date: 2006-09-15 18:30:05 -0400 (Fri, 15 Sep 2006)
New Revision: 1885

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
fixed telefragging in teamplay (note: mirrordamage for telefrags is evil!)


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2006-09-09 21:46:09 UTC (rev 1884)
+++ trunk/data/qcsrc/server/g_damage.qc	2006-09-15 22:30:05 UTC (rev 1885)
@@ -345,32 +345,35 @@
 		damage = damage * bound(0.1, (skill + 5) * 0.1, 1);
 
 	// nullify damage if teamplay is on
-	if(teamplay == 1)
-		if(attacker.team)
-			if(attacker.team == targ.team)
-				damage = 0;
-	if(teamplay == 3)
-		if(attacker != targ)
+	if(deathtype != DEATH_TELEFRAG)
+	{
+		if(teamplay == 1)
 			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")
-					{
-						mirrordamage = cvar("g_mirrordamage") * damage;
-						mirrorforce = cvar("g_mirrordamage") * vlen(force);
-						if(cvar("g_minstagib"))
+		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")
 						{
-							if(cvar("g_friendlyfire") == 0)
-								damage = 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
 						}
-						else
-							damage = cvar("g_friendlyfire") * damage;
-						// mirrordamage will be used LATER
-					}
+	}
 
 	if(cvar("g_lms"))
 	if(targ.classname == "player")