X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=911106a30560358e6ae03054ab21526dc0e6ad8a;hb=3c39aa374dfbbeb40759ed764bad0f9cd8e2aa8c;hp=f6ca98682c3d91eb7b4af582118c06dfed317e41;hpb=6090fd965ca0c109683dc1dbcc041dd37d32339a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index f6ca98682..911106a30 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -635,7 +635,7 @@ void trigger_race_checkpoint_verify()
 			// race only (middle of the race)
 			g_race_qualifying = 0;
 			self.race_place = 0;
-			if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE, FALSE))
+			if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, FALSE))
 				error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for respawning in race) - bailing out"));
 
 			if(i == 0)
@@ -643,7 +643,7 @@ void trigger_race_checkpoint_verify()
 				// qualifying only
 				g_race_qualifying = 1;
 				self.race_place = race_lowest_place_spawn;
-				if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE, FALSE))
+				if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, FALSE))
 					error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for qualifying) - bailing out"));
 				
 				// race only (initial spawn)
@@ -651,7 +651,7 @@ void trigger_race_checkpoint_verify()
 				for(p = 1; p <= race_highest_place_spawn; ++p)
 				{
 					self.race_place = p;
-					if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE, FALSE))
+					if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, FALSE))
 						error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for initially spawning in race) - bailing out"));
 				}
 			}
@@ -663,7 +663,7 @@ void trigger_race_checkpoint_verify()
 		self.race_checkpoint = race_NextCheckpoint(0);
 		g_race_qualifying = 1;
 		self.race_place = race_lowest_place_spawn;
-		if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE, FALSE))
+		if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), 0, FALSE))
 			error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for qualifying) - bailing out"));
 	}
 	else
@@ -764,6 +764,38 @@ void trigger_race_checkpoint_verify()
 	self = oldself;
 }
 
+vector trigger_race_checkpoint_spawn_evalfunc(entity player, entity spot, vector current)
+{
+	if(g_race_qualifying)
+	{
+		// spawn at first
+		if(self.race_checkpoint != 0)
+			return '-1 0 0';
+		if(spot.race_place != race_lowest_place_spawn)
+			return '-1 0 0';
+	}
+	else
+	{
+		if(self.race_checkpoint != player.race_respawn_checkpoint)
+			return '-1 0 0';
+		// try reusing the previous spawn
+		if(self == player.race_respawn_spotref || spot == player.race_respawn_spotref)
+			current_x += SPAWN_PRIO_RACE_PREVIOUS_SPAWN;
+		if(self.race_checkpoint == 0)
+		{
+			float pl;
+			pl = player.race_place;
+			if(pl > race_highest_place_spawn)
+				pl = 0;
+			if(pl == 0 && !player.race_started)
+				pl = race_highest_place_spawn; // use last place if he has not even touched finish yet
+			if(spot.race_place != pl)
+				return '-1 0 0';
+		}
+	}
+	return current;
+}
+
 void spawnfunc_trigger_race_checkpoint()
 {
 	vector o;
@@ -811,6 +843,7 @@ void spawnfunc_trigger_race_checkpoint()
 	}
 
 	self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
+	self.spawn_evalfunc = trigger_race_checkpoint_spawn_evalfunc;
 
 	InitializeEntity(self, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET);
 }