r3315 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-30 11:50:16 -0500 (Wed, 30 Jan 2008)
New Revision: 3315

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
fix logic in IsDifferentTeam


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-01-30 15:43:20 UTC (rev 3314)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-01-30 16:50:16 UTC (rev 3315)
@@ -16,8 +16,15 @@
 float IsDifferentTeam(entity a, entity b)
 {
 	if(teams_matter)
+	{
 		if(a.team == b.team)
 			return 0;
+	}
+	else
+	{
+		if(a == b)
+			return 0;
+	}
 	return 1;
 }