From 14bbee6bd75956af899fb0021453c80a430d85bf Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 18 Dec 2009 22:15:40 +0000 Subject: [PATCH] fix handling when dying before reaching first CP git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8413 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/race.qc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/qcsrc/server/race.qc b/data/qcsrc/server/race.qc index 3c9980e9b..ae66c73d3 100644 --- a/data/qcsrc/server/race.qc +++ b/data/qcsrc/server/race.qc @@ -761,12 +761,12 @@ void race_RetractPlayer() { 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 @@ void race_PostSpawn(entity spot) { 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 @@ void race_PostSpawn(entity spot) 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; -- 2.39.2