r5107 - in trunk/data/qcsrc: common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-26 05:20:42 -0500 (Wed, 26 Nov 2008)
New Revision: 5107

Modified:
   trunk/data/qcsrc/common/mapinfo.qc
   trunk/data/qcsrc/server/assault.qc
Log:
more assault fixes (timelimit)


Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc	2008-11-26 09:42:13 UTC (rev 5106)
+++ trunk/data/qcsrc/common/mapinfo.qc	2008-11-26 10:20:42 UTC (rev 5107)
@@ -467,8 +467,15 @@
 	if(!(pThisType & pWantedType))
 		return;
 	
-	cvar_set("fraglimit", car(s));
-	s = cdr(s);
+	if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT) // these modes don't use fraglimit
+	{
+		cvar_set("fraglimit", "0");
+	}
+	else
+	{
+		cvar_set("fraglimit", car(s));
+		s = cdr(s);
+	}
 
 	cvar_set("timelimit", car(s));
 	s = cdr(s);

Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc	2008-11-26 09:42:13 UTC (rev 5106)
+++ trunk/data/qcsrc/server/assault.qc	2008-11-26 10:20:42 UTC (rev 5107)
@@ -201,6 +201,7 @@
 
 
 void target_assault_roundend_reset() {
+	print("round end reset\n");
 	self.cnt = self.cnt + 1; // up round counter
 	self.winning = 0; // up round
 }
@@ -210,10 +211,6 @@
 }
 
 void spawnfunc_target_assault_roundend() {
-	if(!self.health)
-		self.health = 300; // 5 minutes
-
-	cvar_set("timelimit", ftos(self.health/60));
 	self.winning = 0; // round not yet won by attackers
 	self.classname = "target_assault_roundend";
 	self.use = target_assault_roundend_use;
@@ -267,8 +264,6 @@
 
 	// up round counter
 	self.winning = self.winning + 1;
-	// set end time for next round
-	self.cnt = time + self.health;
 
 	// swap attacker/defender roles
 	if(assault_attacker_team == COLOR_TEAM1) {