r3217 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-22 03:16:38 -0500 (Tue, 22 Jan 2008)
New Revision: 3217

Modified:
   trunk/data/qcsrc/server/assault.qc
Log:
small Assault simplification that should be doing nothing


Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc	2008-01-21 20:47:53 UTC (rev 3216)
+++ trunk/data/qcsrc/server/assault.qc	2008-01-22 08:16:38 UTC (rev 3217)
@@ -49,19 +49,10 @@
 }
 
 void assault_objective_think() {
-	local entity oldself;	
 	if(self.health < 0) {
 		//self.effects = 0;
-		local entity ent;
-		ent = find(world, targetname, self.target);
-		while(ent) {
-			oldself = self;
-			self = ent;
-			self.use();
-			self = oldself;
-			ent = find(ent, targetname, self.target);
-			
-		}
+		activator = self;
+		SUB_UseTargets();
 	} else {
 		//self.effects = EF_STARDUST;
 		self.nextthink = time + 0.1;
@@ -193,7 +184,10 @@
 	self.colormod = '1 1 1';
 	self.cnt = 0; // not active
 	if(self.spawnflags)
+	{
+		activator = self;
 		self.use();
+	}
 }
 
 void assault_destructible_use() {
@@ -202,20 +196,11 @@
 }
 
 void assault_destructible_destroy() {
-	local entity oldself;
-	
 	self.model = "";
 	self.takedamage = DAMAGE_NO;
 	self.solid = SOLID_NOT;
-	local entity ent;
-	ent = find(world, targetname, self.target);
-	while(ent) {
-		oldself = self;
-		self = ent;
-		self.use();
-		self = oldself;
-		ent = find(ent, targetname, self.target);
-	}
+	activator = other;
+	SUB_UseTargets();
 }
 
 void assault_destructible_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) {
@@ -314,16 +299,8 @@
 }
 
 void assault_roundstart_use() {
-	local entity ent;
-	local entity oldself;
-	ent = find(world, targetname, self.target);
-	while(ent) {
-		oldself = self;
-		self = ent;
-		self.use();
-		self = oldself;
-		ent = find(ent, targetname, self.target);
-	}
+	activator = self;
+	SUB_UseTargets();
 }
 
 void target_assault_roundstart() {