Merge branch 'master' into Mirio/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / race.qh

diff --git a/qcsrc/server/race.qh b/qcsrc/server/race.qh
index 51ec4590019abf277b06cc03632f6fa8d110a3b1..6419afb737690604dace62c681cabe9da377f4e7 100644 (file)
--- a/qcsrc/server/race.qh
+++ b/qcsrc/server/race.qh
@@ -4,9 +4,6 @@ float race_teams;
 
 // scores
 const float ST_RACE_LAPS = 1;
-const float SP_RACE_LAPS = 4;
-const float SP_RACE_TIME = 5;
-const float SP_RACE_FASTEST = 6;
 
 bool g_race_qualifying;
 
@@ -32,6 +29,9 @@ float race_completing;
 .float race_respawn_checkpoint;
 .entity race_respawn_spotref; // try THIS spawn in case you respawn
 
+IntrusiveList g_racecheckpoints;
+STATIC_INIT(g_racecheckpoints) { g_racecheckpoints = IL_NEW(); }
+
 // definitions for functions used outside race.qc
 float race_PreviousCheckpoint(float f);
 float race_NextCheckpoint(float f);
@@ -44,7 +44,7 @@ string race_readUID(string map, float pos);
 string race_readName(string map, float pos);
 void race_ClearRecords();
 void race_SendNextCheckpoint(entity e, float spec);
-void race_PreparePlayer();
+void race_PreparePlayer(entity this);
 void race_send_recordtime(float msg);
 void race_send_speedaward(float msg);
 
@@ -62,6 +62,6 @@ void race_send_speedaward_alltimebest(float msg);
 
 void race_SendRankings(float pos, float prevpos, float del, float msg);
 
-void race_RetractPlayer();
+void race_RetractPlayer(entity this);
 
 void race_InitSpectator();