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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-18 17:15:40 -0500 (Fri, 18 Dec 2009)
New Revision: 8413

Modified:
   trunk/data/qcsrc/server/race.qc
Log:
fix handling when dying before reaching first CP


Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2009-12-18 22:01:51 UTC (rev 8412)
+++ trunk/data/qcsrc/server/race.qc	2009-12-18 22:15:40 UTC (rev 8413)
@@ -761,12 +761,12 @@
 {
 	if(!g_race && !g_cts)
 		return;
-	self.race_checkpoint = race_PreviousCheckpoint(self.race_checkpoint);
+	if(self.race_started)
+		self.race_checkpoint = race_PreviousCheckpoint(self.race_checkpoint);
+	else
+		self.race_checkpoint = 0;
 	if(self.race_checkpoint == 0)
-	{
 		race_ClearTime(self);
-		self.race_checkpoint = 0;
-	}
 }
 
 void race_PreDie()
@@ -791,7 +791,7 @@
 {
 	if(!g_race && !g_cts)
 		return;
-	if(self.killcount != -666 && !g_race_qualifying)
+	if(self.killcount != -666 /* REspawning, not spawning */ && !g_race_qualifying)
 	{
 		if(spot.target == "")
 			// let the player run without timing, if he did not spawn at a targetting spawnpoint
@@ -800,7 +800,7 @@
 			race_RetractPlayer();
 	}
 
-	if(spot.target != "" && self.race_checkpoint == -1)
+	if(spot.target != "" && self.race_checkpoint == -1 && self.race_started)
 		self.race_checkpoint = 0;
 
 	self.race_place = 0;