r3218 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-22 03:21:44 -0500 (Tue, 22 Jan 2008)
New Revision: 3218

Modified:
   trunk/data/qcsrc/server/arena.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
make Arena's reset function also reset spawnpoints


Modified: trunk/data/qcsrc/server/arena.qc
===================================================================
--- trunk/data/qcsrc/server/arena.qc	2008-01-22 08:16:38 UTC (rev 3217)
+++ trunk/data/qcsrc/server/arena.qc	2008-01-22 08:21:44 UTC (rev 3218)
@@ -81,6 +81,10 @@
 		{
 			dom_controlpoint_setup();
 		}
+		else if(self.classname == "info_player_deathmatch")
+		{
+			self.team = self.team_saved; // reset spawns to their original state too!
+		}
 		else if(self.flags & FL_ITEM)			// reset items
 		{
 			self.model = self.mdl;
@@ -99,6 +103,8 @@
 		{
 			removedecor(self);
 		}
+		// TODO properly reset Onslaught
+		// TODO properly reset Assault
 		self = nextent(self);
 	}
 

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-01-22 08:16:38 UTC (rev 3217)
+++ trunk/data/qcsrc/server/defs.qh	2008-01-22 08:21:44 UTC (rev 3218)
@@ -384,3 +384,5 @@
 
 // database
 float ServerProgsDB;
+
+.float team_saved;

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-01-22 08:16:38 UTC (rev 3217)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-01-22 08:21:44 UTC (rev 3218)
@@ -188,6 +188,7 @@
 	}
 
 	self.use = spawnpoint_use;
+	self.team_saved = self.team;
 }
 
 #define strstr strstrofs