r4073 - in trunk/data: qcsrc/server scripts

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-09 09:04:25 -0400 (Sat, 09 Aug 2008)
New Revision: 4073

Modified:
   trunk/data/qcsrc/server/race.qc
   trunk/data/scripts/entities.def
Log:
info_player_race


Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2008-08-09 13:02:15 UTC (rev 4072)
+++ trunk/data/qcsrc/server/race.qc	2008-08-09 13:04:25 UTC (rev 4073)
@@ -196,11 +196,13 @@
 {
 	vector o;
 	if(!g_race)
+	{
+		remove(self);
 		return;
+	}
 	InitTrigger();
-	if(self.targetname)
-		self.use = checkpoint_use;
-	else
+	self.use = checkpoint_use;
+	if not(self.spawnflags & 1)
 		self.touch = checkpoint_touch;
 
 	o = (self.absmin + self.absmax) * 0.5;
@@ -233,3 +235,13 @@
 		return;
 	race_ClearTime(self);
 }
+
+void spawnfunc_info_player_race (void)
+{
+	if(!g_race)
+	{
+		remove(self);
+		return;
+	}
+	spawnfunc_info_player_deathmatch();
+}

Modified: trunk/data/scripts/entities.def
===================================================================
--- trunk/data/scripts/entities.def	2008-08-09 13:02:15 UTC (rev 4072)
+++ trunk/data/scripts/entities.def	2008-08-09 13:04:25 UTC (rev 4073)
@@ -226,6 +226,13 @@
 cnt: weight of spawn point for random selection. Set to a lower value if you have many spawn points close together. Default value is 1.
 */
 
+/*QUAKED info_player_race (1 0.5 0) (-16 -16 -24) (16 16 45) 
+Race spawn point.
+-------- KEYS --------
+target: this should point to a trigger_race_checkpoint to decide when this spawning point is active. The checkpoint has to be AFTER this spawn.
+cnt: weight of spawn point for random selection. Set to a lower value if you have many spawn points close together. Default value is 1.
+*/
+
 /*QUAKED info_player_deathmatch (0 1 0) (-16 -16 -24) (16 16 45) 
 Normal player spawning location in game types without team spawns. Should touch the floor, but not the walls, and should point where the player should look when he spawns there.
 -------- KEYS --------
@@ -887,12 +894,14 @@
 _celshader: Sets the cel shader used for this geometry. Note: omit the "textures/" prefix.
 */
 
-/*QUAKED trigger_race_checkpoint (0 1 0) ? - - CRUSH
+/*QUAKED trigger_race_checkpoint (0 1 0) ? NOTOUCH - CRUSH
 A checkpoint, for the race game mode. Be sure to make them quite long, so they actually catch a player reliably!
 -------- KEYS --------
 cnt: Number of the checkpoint. 0 for finish line, and at least two other checkpoints have to exist. They MUST be touched in sequential order!
 message: Death message, when touching checkpoints in the wrong order.
+targetname: Name of the checkpoint. info_player_race can target this to assign a spawn to a checkpoint. Also used for triggering a checkpoint by an event.
 -------- SPAWNFLAGS --------
+NOTOUCH: the checkpoint will not become active when touched, it HAS to be targeted
 CRUSH: the checkpoint kills when used at the wrong time
 */