r3574 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: avirox
Date: 2008-04-02 16:48:40 -0400 (Wed, 02 Apr 2008)
New Revision: 3574

Modified:
   trunk/data/qcsrc/server/domination.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
- Added trigger support to Dom points when captured ("target" field)
- Added have_team_spawns support for Domination mode

Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc	2008-04-02 18:08:29 UTC (rev 3573)
+++ trunk/data/qcsrc/server/domination.qc	2008-04-02 20:48:40 UTC (rev 3574)
@@ -33,6 +33,7 @@
 void dompoint_captured ()
 {
 	local entity head;
+	local float old_delay;
 
 	// now that the delay has expired, switch to the latest team to lay claim to this point
 	head = self.aiment;
@@ -64,10 +65,18 @@
 
 	//self.nextthink = time + cvar("g_domination_point_rate");
 	//self.think = dompointthink;
+	
 	if(cvar("g_domination_point_rate"))
 		self.delay = time + cvar("g_domination_point_rate");
 	else
 		self.delay = time + self.wait;
+		
+	// do trigger work
+	old_delay = self.delay;
+	self.delay = 0;
+	activator = self;
+	SUB_UseTargets ();
+	self.delay = old_delay;	
 };
 
 void AnimateDomPoint()

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-04-02 18:08:29 UTC (rev 3573)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-04-02 20:48:40 UTC (rev 3574)
@@ -190,7 +190,7 @@
 	self.use = spawnpoint_use;
 	self.team_saved = self.team;
 
-	if(g_ctf || g_assault || g_onslaught)
+	if(g_ctf || g_assault || g_onslaught || g_domination)
 	if(self.team)
 		have_team_spawns = 1;
 }