[nexuiz-commits] r8419 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-19 11:32:07 -0500 (Sat, 19 Dec 2009)
New Revision: 8419

Modified:
   trunk/data/qcsrc/server/race.qc
Log:
revert the last change in case of the finish line spawns. Now, dying before finish gets you to a last-place spawnpoint (due to race_place getting erased), dying after that gets you back to the very same spawn again, and dying after finish gets you to a race_place 0 spawnpoint.


Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2009-12-19 16:29:39 UTC (rev 8418)
+++ trunk/data/qcsrc/server/race.qc	2009-12-19 16:32:07 UTC (rev 8419)
@@ -409,9 +409,6 @@
 
 	if((other.race_checkpoint == -1 && self.race_checkpoint == 0) || (other.race_checkpoint == self.race_checkpoint))
 	{
-		// once he has seen the start, he can spawn normally at place-0 spawns
-		other.race_started = 1;
-
 		if(self.race_penalty)
 		{
 			if(other.race_lastpenalty != self)
@@ -436,10 +433,11 @@
 			self.message = oldmsg;
 		}
 
-		if(other.race_respawn_checkpoint != self.race_checkpoint)
+		if(other.race_respawn_checkpoint != self.race_checkpoint || !other.race_started)
 			other.race_respawn_spotref = self; // this is not a spot but a CP, but spawnpoint selection will deal with that
 		other.race_respawn_checkpoint = self.race_checkpoint;
 		other.race_checkpoint = race_NextCheckpoint(self.race_checkpoint);
+		other.race_started = 1;
 
 		race_SendTime(other, self.race_checkpoint, other.race_movetime, !!other.race_laptime);