X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Frace.qc;h=3d6e9e85e80eacdfd3bf2371af6dcdcbf46a5afb;hb=1d70346809dd33b32864b3832662878077588e4b;hp=fe7606a39ba1ebba3dbe87b009a8ded4669289b5;hpb=011c85517b7460bf24e2c350fcd742006359f71f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index fe7606a39..3d6e9e85e 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -165,8 +165,7 @@ void race_SendNextCheckpoint(entity e, float spec) // qualifying only
 	if(!spec)
 		msg_entity = e;
 	WRITESPECTATABLE_MSG_ONE({
-		WriteByte(MSG_ONE, SVC_TEMPENTITY);
-		WriteByte(MSG_ONE, TE_CSQC_RACE);
+		WriteHeader(MSG_ONE, TE_CSQC_RACE);
 		if(spec)
 		{
 			WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_NEXT_SPEC_QUALIFYING);
@@ -184,8 +183,7 @@ void race_SendNextCheckpoint(entity e, float spec) // qualifying only
 void race_send_recordtime(float msg)
 {
 	// send the server best time
-	WriteByte(msg, SVC_TEMPENTITY);
-	WriteByte(msg, TE_CSQC_RACE);
+	WriteHeader(msg, TE_CSQC_RACE);
 	WriteByte(msg, RACE_NET_SERVER_RECORD);
 	WriteInt24_t(msg, race_readTime(GetMapname(), 1));
 }
@@ -194,8 +192,7 @@ void race_send_recordtime(float msg)
 void race_send_speedaward(float msg)
 {
 	// send the best speed of the round
-	WriteByte(msg, SVC_TEMPENTITY);
-	WriteByte(msg, TE_CSQC_RACE);
+	WriteHeader(msg, TE_CSQC_RACE);
 	WriteByte(msg, RACE_NET_SPEED_AWARD);
 	WriteInt24_t(msg, floor(speedaward_speed+0.5));
 	WriteString(msg, speedaward_holder);
@@ -204,8 +201,7 @@ void race_send_speedaward(float msg)
 void race_send_speedaward_alltimebest(float msg)
 {
 	// send the best speed
-	WriteByte(msg, SVC_TEMPENTITY);
-	WriteByte(msg, TE_CSQC_RACE);
+	WriteHeader(msg, TE_CSQC_RACE);
 	WriteByte(msg, RACE_NET_SPEED_AWARD_BEST);
 	WriteInt24_t(msg, floor(speedaward_alltimebest+0.5));
 	WriteString(msg, speedaward_alltimebest_holder);
@@ -213,8 +209,7 @@ void race_send_speedaward_alltimebest(float msg)
 
 void race_SendRankings(float pos, float prevpos, float del, float msg)
 {
-	WriteByte(msg, SVC_TEMPENTITY);
-	WriteByte(msg, TE_CSQC_RACE);
+	WriteHeader(msg, TE_CSQC_RACE);
 	WriteByte(msg, RACE_NET_SERVER_RANKINGS);
 	WriteShort(msg, pos);
 	WriteShort(msg, prevpos);
@@ -235,8 +230,7 @@ void race_SendStatus(float id, entity e)
 		msg = MSG_ALL;
 	msg_entity = e;
 	WRITESPECTATABLE_MSG_ONE_VARNAME(dummy3, {
-		WriteByte(msg, SVC_TEMPENTITY);
-		WriteByte(msg, TE_CSQC_RACE);
+		WriteHeader(msg, TE_CSQC_RACE);
 		WriteByte(msg, RACE_NET_SERVER_STATUS);
 		WriteShort(msg, id);
 		WriteString(msg, e.netname);
@@ -447,8 +441,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
 			if(g_race_qualifying)
 			{
 				WRITESPECTATABLE_MSG_ONE_VARNAME(dummy1, {
-					WriteByte(MSG_ONE, SVC_TEMPENTITY);
-					WriteByte(MSG_ONE, TE_CSQC_RACE);
+					WriteHeader(MSG_ONE, TE_CSQC_RACE);
 					WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_HIT_QUALIFYING);
 					WriteByte(MSG_ONE, race_CheckpointNetworkID(cp)); // checkpoint the player now is at
 					WriteInt24_t(MSG_ONE, t); // time to that intermediate
@@ -476,8 +469,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
 		{
 			msg_entity = e;
 			WRITESPECTATABLE_MSG_ONE_VARNAME(dummy2, {
-				WriteByte(MSG_ONE, SVC_TEMPENTITY);
-				WriteByte(MSG_ONE, TE_CSQC_RACE);
+				WriteHeader(MSG_ONE, TE_CSQC_RACE);
 				WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_HIT_RACE);
 				WriteByte(MSG_ONE, race_CheckpointNetworkID(cp)); // checkpoint the player now is at
 				if(e == oth)
@@ -503,8 +495,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
 		{
 			msg_entity = oth;
 			WRITESPECTATABLE_MSG_ONE_VARNAME(dummy3, {
-				WriteByte(MSG_ONE, SVC_TEMPENTITY);
-				WriteByte(MSG_ONE, TE_CSQC_RACE);
+				WriteHeader(MSG_ONE, TE_CSQC_RACE);
 				WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_HIT_RACE_BY_OPPONENT);
 				WriteByte(MSG_ONE, race_CheckpointNetworkID(cp)); // checkpoint the player now is at
 				if(e == oth)
@@ -537,8 +528,7 @@ void race_ClearTime(entity e)
 
 	msg_entity = e;
 	WRITESPECTATABLE_MSG_ONE({
-		WriteByte(MSG_ONE, SVC_TEMPENTITY);
-		WriteByte(MSG_ONE, TE_CSQC_RACE);
+		WriteHeader(MSG_ONE, TE_CSQC_RACE);
 		WriteByte(MSG_ONE, RACE_NET_CHECKPOINT_CLEAR); // next
 	});
 }
@@ -1100,8 +1090,7 @@ void race_ImposePenaltyTime(entity pl, float penalty, string reason)
 		{
 			msg_entity = pl;
 			WRITESPECTATABLE_MSG_ONE({
-				WriteByte(MSG_ONE, SVC_TEMPENTITY);
-				WriteByte(MSG_ONE, TE_CSQC_RACE);
+				WriteHeader(MSG_ONE, TE_CSQC_RACE);
 				WriteByte(MSG_ONE, RACE_NET_PENALTY_QUALIFYING);
 				WriteShort(MSG_ONE, TIME_ENCODE(penalty));
 				WriteString(MSG_ONE, reason);
@@ -1115,8 +1104,7 @@ void race_ImposePenaltyTime(entity pl, float penalty, string reason)
 		{
 			msg_entity = pl;
 			WRITESPECTATABLE_MSG_ONE_VARNAME(dummy, {
-				WriteByte(MSG_ONE, SVC_TEMPENTITY);
-				WriteByte(MSG_ONE, TE_CSQC_RACE);
+				WriteHeader(MSG_ONE, TE_CSQC_RACE);
 				WriteByte(MSG_ONE, RACE_NET_PENALTY_RACE);
 				WriteShort(MSG_ONE, TIME_ENCODE(penalty));
 				WriteString(MSG_ONE, reason);