X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=9a12a04866c2c251fdd333725f0a22c4af757fff;hb=4762eecb5c266737122dc29bcb060896c2b0cf76;hp=6fc828dc9459ec85cd59d32ee04ac54656196da4;hpb=0c6b993abfdde30411dc771643b8d25b8377cb50;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index 6fc828dc9..9a12a0486 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -14,13 +14,21 @@
 #include <common/gamemodes/rules.qh>
 #include <common/net_linked.qh>
 #include <common/state.qh>
-#include "../common/triggers/subs.qh"
+#include <common/weapons/weapon/porto.qh>
+#include "../common/mapobjects/subs.qh"
+#include <common/mapobjects/triggers.qh>
 #include "../lib/warpzone/util_server.qh"
 #include "../lib/warpzone/common.qh"
+#include <common/vehicles/sv_vehicles.qh>
 #include "../common/mutators/mutator/waypoints/waypointsprites.qh"
 
 IntrusiveList g_race_targets;
-STATIC_INIT(g_race_targets) { g_race_targets = IL_NEW(); }
+IntrusiveList g_racecheckpoints;
+STATIC_INIT(g_race)
+{
+	g_race_targets = IL_NEW();
+	g_racecheckpoints = IL_NEW();
+}
 
 void race_InitSpectator()
 {
@@ -29,8 +37,6 @@ void race_InitSpectator()
 			race_SendNextCheckpoint(msg_entity.enemy, 1);
 }
 
-void W_Porto_Fail(entity this, float failhard);
-
 float race_readTime(string map, float pos)
 {
 	string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
@@ -84,8 +90,11 @@ void race_writeTime(string map, float t, string myuid)
 		// player has no ranked record yet
 		for (i = RANKINGS_CNT; i > newpos; --i)
 		{
-			db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1)));
-			db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1));
+			float other_time = race_readTime(map, i - 1);
+			if (other_time) {
+				db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(other_time));
+				db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1));
+			}
 		}
 	}
 
@@ -104,8 +113,6 @@ string race_readName(string map, float pos)
 
 const float MAX_CHECKPOINTS = 255;
 
-spawnfunc(target_checkpoint);
-
 .float race_penalty;
 .float race_penalty_accumulator;
 .string race_penalty_reason;
@@ -224,6 +231,14 @@ void race_send_speedaward_alltimebest(float msg)
 	WriteString(msg, speedaward_alltimebest_holder);
 }
 
+void race_send_rankings_cnt(float msg)
+{
+	WriteHeader(msg, TE_CSQC_RACE);
+	WriteByte(msg, RACE_NET_RANKINGS_CNT);
+	int m = min(RANKINGS_CNT, autocvar_g_cts_send_rankings_cnt);
+	WriteByte(msg, m);
+}
+
 void race_SendRankings(float pos, float prevpos, float del, float msg)
 {
 	WriteHeader(msg, TE_CSQC_RACE);
@@ -316,9 +331,7 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e,
 	}
 
 	race_SendRankings(newpos, player_prevpos, 0, MSG_ALL);
-	if(rankings_reply)
-		strunzone(rankings_reply);
-	rankings_reply = strzone(getrankings());
+	strcpy(rankings_reply, getrankings());
 
 	if(newpos == player_prevpos)
 	{
@@ -366,9 +379,7 @@ void race_deleteTime(string map, float pos)
 	if(pos == 1)
 		race_send_recordtime(MSG_ALL);
 
-	if(rankings_reply)
-		strunzone(rankings_reply);
-	rankings_reply = strzone(getrankings());
+	strcpy(rankings_reply, getrankings());
 }
 
 void race_SendTime(entity e, float cp, float t, float tvalid)
@@ -442,9 +453,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
 				if(t < recordtime || recordtime == 0)
 				{
 					race_checkpoint_records[cp] = t;
-					if(race_checkpoint_recordholders[cp])
-						strunzone(race_checkpoint_recordholders[cp]);
-					race_checkpoint_recordholders[cp] = strzone(e.netname);
+					strcpy(race_checkpoint_recordholders[cp], e.netname);
 					if(g_race_qualifying)
 						FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it) && it.race_checkpoint == cp, { race_SendNextCheckpoint(it, 0); });
 				}
@@ -563,6 +572,9 @@ void race_ClearTime(entity e)
 
 void checkpoint_passed(entity this, entity player)
 {
+	if(IS_VEHICLE(player) && player.owner)
+		player = player.owner;
+
 	if(player.personal && autocvar_g_allow_checkpoints)
 		return; // practice mode!
 
@@ -705,7 +717,7 @@ void checkpoint_passed(entity this, entity player)
 	else
 	{
 		if(this.spawnflags & 4)
-			Damage (player, this, this, 10000, DEATH_HURTTRIGGER.m_id, player.origin, '0 0 0');
+			Damage (player, this, this, 10000, DEATH_HURTTRIGGER.m_id, DMG_NOWEP, player.origin, '0 0 0');
 	}
 }
 
@@ -995,7 +1007,7 @@ spawnfunc(target_checkpoint) // defrag entity
 	defrag_ents = 1;
 
 	// if this is targeted, then it probably isn't a trigger
-	bool is_trigger = !boolean(!this.nottargeted && this.targetname != "");
+	bool is_trigger = this.targetname == "";
 
 	if(is_trigger)
 		EXACTTRIGGER_INIT;
@@ -1089,9 +1101,7 @@ void race_ClearRecords()
 	for(int j = 0; j < MAX_CHECKPOINTS; ++j)
 	{
 		race_checkpoint_records[j] = 0;
-		if(race_checkpoint_recordholders[j])
-			strunzone(race_checkpoint_recordholders[j]);
-		race_checkpoint_recordholders[j] = string_null;
+		strfree(race_checkpoint_recordholders[j]);
 	}
 
 	FOREACH_CLIENT(true, {