r5631 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-22 07:32:02 -0500 (Thu, 22 Jan 2009)
New Revision: 5631

Modified:
   trunk/data/qcsrc/server/arena.qc
   trunk/data/qcsrc/server/clientcommands.qc
   trunk/data/qcsrc/server/gamecommand.qc
Log:
__FORCE_READY_RESTART: do not respawn players during that (so you can see if it resets platforms right)


Modified: trunk/data/qcsrc/server/arena.qc
===================================================================
--- trunk/data/qcsrc/server/arena.qc	2009-01-22 12:29:04 UTC (rev 5630)
+++ trunk/data/qcsrc/server/arena.qc	2009-01-22 12:32:02 UTC (rev 5631)
@@ -25,7 +25,7 @@
  * Resets the state of all clients, items, flags, runes, keys, weapons, waypoints, ... of the map.
  * Sets the 'warmup' global variable.
  */
-void reset_map()
+void reset_map(float norespawn)
 {
 	entity oldself;
 	oldself = self;
@@ -158,6 +158,7 @@
 
 	// Moving the player reset code here since the player-reset depends
 	// on spawnpoint entities which have to be reset first --blub
+	if(!norespawn)
 	FOR_EACH_CLIENT(self) {
 		if(self.flags & FL_CLIENT)				// reset all players
 		{
@@ -332,7 +333,7 @@
 			champion = find(world, classname, "player");
 			while(champion && champion.deadflag)
 				champion = find(champion, classname, "player");
-			reset_map();
+			reset_map(TRUE);
 		}
 
 		while(numspawned < maxspawned && spawnqueue_first)

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2009-01-22 12:29:04 UTC (rev 5630)
+++ trunk/data/qcsrc/server/clientcommands.qc	2009-01-22 12:32:02 UTC (rev 5631)
@@ -393,7 +393,7 @@
 
 	//reset map immediately if this cvar is not set
 	if (!cvar("sv_ready_restart_after_countdown"))
-		reset_map();
+		reset_map(TRUE);
 	
 	if(cvar("sv_eventlog"))
 		GameLogEcho(":restart");
@@ -459,7 +459,7 @@
 		if(self.spawnflags & 1)
 		{
 			restart_mapalreadyrestarted = 1;
-			reset_map();
+			reset_map(TRUE);
 		}
 
 		FOR_EACH_REALCLIENT(plr) {

Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc	2009-01-22 12:29:04 UTC (rev 5630)
+++ trunk/data/qcsrc/server/gamecommand.qc	2009-01-22 12:32:02 UTC (rev 5631)
@@ -822,7 +822,8 @@
 
 	if(argv(0) == "__FORCE_READY_RESTART")
 	{
-		ReadyRestartForce();
+		reset_map(FALSE);
+		return;
 	}
 
 	print("Invalid command. For a list of supported commands, try sv_cmd help.\n");