X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=c940afb94dc4af026a48549bf321fb9d14c32744;hb=c0add59c57c00b31e0db86871ad776ffacc9165e;hp=c5a96b62a266509c42c327f6f862b7bed6c2b8ee;hpb=80ffd95ff0679bd8fdc1902cdb6646e8905bb29a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index c5a96b62a..c940afb94 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -66,11 +66,6 @@ void write_recordmarker(entity pl, float tstart, float dt)
 
 IntrusiveList g_race_targets;
 IntrusiveList g_racecheckpoints;
-STATIC_INIT(g_race)
-{
-	g_race_targets = IL_NEW();
-	g_racecheckpoints = IL_NEW();
-}
 
 void race_InitSpectator()
 {
@@ -260,7 +255,6 @@ void race_send_recordtime(float msg)
 	WriteInt24_t(msg, race_readTime(GetMapname(), 1));
 }
 
-
 void race_send_speedaward(float msg)
 {
 	// send the best speed of the round
@@ -287,7 +281,7 @@ void race_send_rankings_cnt(float msg)
 	WriteByte(msg, m);
 }
 
-void race_SendRankings(float pos, float prevpos, float del, float msg)
+void race_SendRanking(float pos, float prevpos, float del, float msg)
 {
 	WriteHeader(msg, TE_CSQC_RACE);
 	WriteByte(msg, RACE_NET_SERVER_RANKINGS);
@@ -298,6 +292,56 @@ void race_SendRankings(float pos, float prevpos, float del, float msg)
 	WriteInt24_t(msg, race_readTime(GetMapname(), pos));
 }
 
+void race_SpeedAwardFrame(entity player)
+{
+	if (IS_OBSERVER(player))
+		return;
+
+	if(vdist(player.velocity - player.velocity_z * '0 0 1', >, speedaward_speed))
+	{
+		speedaward_speed = vlen(player.velocity - player.velocity_z * '0 0 1');
+		speedaward_holder = player.netname;
+		speedaward_uid = player.crypto_idfp;
+		speedaward_lastupdate = time;
+	}
+	if (speedaward_speed > speedaward_lastsent && (time - speedaward_lastupdate > 1 || intermission_running))
+	{
+		race_send_speedaward(MSG_ALL);
+		speedaward_lastsent = speedaward_speed;
+		if (speedaward_speed > speedaward_alltimebest && speedaward_uid != "")
+		{
+			speedaward_alltimebest = speedaward_speed;
+			speedaward_alltimebest_holder = speedaward_holder;
+			speedaward_alltimebest_uid = speedaward_uid;
+			db_put(ServerProgsDB, strcat(GetMapname(), record_type, "speed/speed"), ftos(speedaward_alltimebest));
+			db_put(ServerProgsDB, strcat(GetMapname(), record_type, "speed/crypto_idfp"), speedaward_alltimebest_uid);
+			race_send_speedaward_alltimebest(MSG_ALL);
+		}
+	}
+}
+
+void race_SendAll(entity player, bool only_rankings)
+{
+	if(!IS_REAL_CLIENT(player))
+		return;
+
+	msg_entity = player;
+	if (!only_rankings)
+	{
+		race_send_recordtime(MSG_ONE);
+		race_send_speedaward(MSG_ONE);
+
+		speedaward_alltimebest = stof(db_get(ServerProgsDB, strcat(GetMapname(), record_type, "speed/speed")));
+		speedaward_alltimebest_holder = uid2name(db_get(ServerProgsDB, strcat(GetMapname(), record_type, "speed/crypto_idfp")));
+		race_send_speedaward_alltimebest(MSG_ONE);
+	}
+
+	int m = min(RANKINGS_CNT, autocvar_g_cts_send_rankings_cnt);
+	race_send_rankings_cnt(MSG_ONE);
+	for (int i = 1; i <= m; ++i)
+		race_SendRanking(i, 0, 0, MSG_ONE);
+}
+
 void race_SendStatus(float id, entity e)
 {
 	if(!IS_REAL_CLIENT(e))
@@ -378,7 +422,7 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e,
 		race_send_recordtime(MSG_ALL);
 	}
 
-	race_SendRankings(newpos, player_prevpos, 0, MSG_ALL);
+	race_SendRanking(newpos, player_prevpos, 0, MSG_ALL);
 	strcpy(rankings_reply, getrankings());
 
 	if(newpos == player_prevpos)
@@ -421,7 +465,7 @@ void race_deleteTime(string map, float pos)
 		}
 	}
 
-	race_SendRankings(pos, 0, 1, MSG_ALL);
+	race_SendRanking(pos, 0, 1, MSG_ALL);
 	if(pos == 1)
 		race_send_recordtime(MSG_ALL);
 
@@ -1042,8 +1086,14 @@ spawnfunc(trigger_race_checkpoint)
 	this.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player;
 	this.spawn_evalfunc = trigger_race_checkpoint_spawn_evalfunc;
 
+	if (!g_racecheckpoints)
+		g_racecheckpoints = IL_NEW();
 	IL_PUSH(g_racecheckpoints, this);
 
+	// trigger_race_checkpoint_verify checks this list too
+	if (!g_race_targets)
+		g_race_targets = IL_NEW();
+
 	InitializeEntity(this, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET);
 }
 
@@ -1087,8 +1137,14 @@ void target_checkpoint_setup(entity this)
 
 	race_timed_checkpoint = 1;
 
+	if (!g_race_targets)
+		g_race_targets = IL_NEW();
 	IL_PUSH(g_race_targets, this);
 
+	// trigger_race_checkpoint_verify checks this list too
+	if (!g_racecheckpoints)
+		g_racecheckpoints = IL_NEW();
+
 	InitializeEntity(this, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET);
 }