r3850 - trunk/data/qcsrc/server

[savagex at icculus.org]

Author: savagex
Date: 2008-07-20 13:44:22 -0400 (Sun, 20 Jul 2008)
New Revision: 3850

Modified:
   trunk/data/qcsrc/server/assault.qc
Log:
trying to fix bitrotten assault mode, round one: Wrong activator team 
set when blowing up a wall, preventing objective health decrease


Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc	2008-07-20 16:14:56 UTC (rev 3849)
+++ trunk/data/qcsrc/server/assault.qc	2008-07-20 17:44:22 UTC (rev 3850)
@@ -131,11 +131,15 @@
 // decrease the health of targeted objectives
 void assault_objective_decrease_use() {
 
-	if(self.cnt > 0)
+	if(self.cnt > 0) {
+		// did already fire
 		return;
+	}
 
-	if(activator.team != assault_attacker_team)
+	if(activator.team != assault_attacker_team) {
+		// wrong team triggered decrease
 		return;
+	}
 
 	local entity ent;
 	ent = find(world, targetname, self.target);
@@ -199,7 +203,6 @@
 	self.model = "";
 	self.takedamage = DAMAGE_NO;
 	self.solid = SOLID_NOT;
-	activator = other;
 	SUB_UseTargets();
 }