r115 - trunk/progsqc

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Mar 26 14:01:59 EDT 2008


Author: vermeulen
Date: 2008-03-26 14:01:59 -0400 (Wed, 26 Mar 2008)
New Revision: 115

Modified:
   trunk/progsqc/damage.qc
Log:
opps, small fix

Modified: trunk/progsqc/damage.qc
===================================================================
--- trunk/progsqc/damage.qc	2008-03-26 17:59:16 UTC (rev 114)
+++ trunk/progsqc/damage.qc	2008-03-26 18:01:59 UTC (rev 115)
@@ -24,7 +24,7 @@
 	oldself = self;
 	self = targ;
 
-	if ((targ.team == attacker.team) && cvar("g_teams"))
+	if ((targ.team == attacker.team) && cvar("g_teams") && (targ != attacker))
 	{
 		damage = damage * cvar("g_teams_friendlyfire");
 	}




More information about the zymotic-commits mailing list