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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Dec 19 11:41:45 EST 2009


Author: div0
Date: 2009-12-19 11:41:44 -0500 (Sat, 19 Dec 2009)
New Revision: 8420

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/race.qc
Log:
we didn't need that CP -1 handling any more


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-12-19 16:32:07 UTC (rev 8419)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-12-19 16:41:44 UTC (rev 8420)
@@ -164,7 +164,7 @@
 					}
 					else
 					{
-						if(ent.race_checkpoint != max(0, self.race_respawn_checkpoint))
+						if(ent.race_checkpoint != self.race_respawn_checkpoint)
 							return '-1 0 0';
 						// try reusing the previous spawn
 						if(ent == self.race_respawn_spotref || spot == self.race_respawn_spotref)

Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2009-12-19 16:32:07 UTC (rev 8419)
+++ trunk/data/qcsrc/server/race.qc	2009-12-19 16:41:44 UTC (rev 8420)
@@ -301,7 +301,7 @@
 
 void race_ClearTime(entity e)
 {
-	e.race_checkpoint = -1;
+	e.race_checkpoint = 0;
 	e.race_laptime = 0;
 	e.race_movetime = e.race_movetime_frac = e.race_movetime_count = 0;
 	e.race_penalty_accumulator = 0;
@@ -492,7 +492,7 @@
 
 float race_waypointsprite_visible_for_player(entity e)
 {
-	if(e.race_checkpoint == -1 || e.race_checkpoint == -2)
+	if(e.race_checkpoint == -1 || self.owner.race_checkpoint == -2)
 		return TRUE;
 	else if(e.race_checkpoint == self.owner.race_checkpoint)
 		return TRUE;
@@ -762,7 +762,7 @@
 	race_ClearTime(self);
 	self.race_place = 0;
 	self.race_started = 0;
-	self.race_respawn_checkpoint = -1;
+	self.race_respawn_checkpoint = 0;
 	self.race_respawn_spotref = world;
 }
 
@@ -770,7 +770,7 @@
 {
 	if(!g_race && !g_cts)
 		return;
-	if(self.race_respawn_checkpoint == 0 || self.race_respawn_checkpoint == -1 || self.race_respawn_checkpoint == race_timed_checkpoint)
+	if(self.race_respawn_checkpoint == 0 || self.race_respawn_checkpoint == race_timed_checkpoint)
 		race_ClearTime(self);
 	self.race_checkpoint = self.race_respawn_checkpoint;
 }
@@ -816,6 +816,7 @@
 	if(!g_race && !g_cts)
 		return;
 	race_PreparePlayer();
+	self.race_checkpoint = -1;
 }
 
 void spawnfunc_info_player_race (void)



More information about the nexuiz-commits mailing list