r4698 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Oct 10 05:18:36 EDT 2008


Author: div0
Date: 2008-10-10 05:18:35 -0400 (Fri, 10 Oct 2008)
New Revision: 4698

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
tiny cleanup


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-10-10 08:57:11 UTC (rev 4697)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-10-10 09:18:35 UTC (rev 4698)
@@ -572,13 +572,6 @@
 			attacker.lms_traveled_distance = cvar("g_lms_campcheck_distance");
 		}
 
-		if(targ != attacker)
-		if(!targ.deadflag)
-		if(damage > 0)
-		if(targ.classname == "player")
-		if(attacker)
-			attacker.hitsound += 1;
-
 		if (g_minstagib)
 		{
 			if ((deathtype == DEATH_FALL)  ||
@@ -678,11 +671,15 @@
 		}
 
 		// count the damage
+		if(attacker)
+		if(targ.classname == "player")
 		if(IsDifferentTeam(targ, attacker))
-		if (!targ.deadflag)
+		if(!targ.deadflag)
 		if(targ.takedamage == DAMAGE_AIM)
 		if(damage > 0)
 		{
+			attacker.hitsound += 1;
+
 			damage_goodhits += 1;
 			damage_gooddamage += damage;
 




More information about the nexuiz-commits mailing list