From: drjaska <drjaska83@gmail.com>
Date: Mon, 27 May 2024 13:16:45 +0000 (+0300)
Subject: Merge branch 'master' into drjaska/g_cts_cptimes_onlyself
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ada6f6fe4c99b42a5220820e363847529e8c6ac;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into drjaska/g_cts_cptimes_onlyself
---

3ada6f6fe4c99b42a5220820e363847529e8c6ac
diff --cc qcsrc/server/race.qc
index 90b28190b1,7f37db341c..089c483550
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@@ -526,18 -518,11 +526,22 @@@ void race_SendTime(entity e, float cp, 
  
  		if(tvalid)
  		{
- 			float myrecordtime = e.race_checkpoint_record[cp];
- 			if (autocvar_g_race_cptimes_onlyself) {
- 				recordtime = myrecordtime;
 -			recordtime = race_checkpoint_records[cp];
 -			recordholder = strcat(race_checkpoint_recordholders[cp]); // make a tempstring copy, as we'll possibly strunzone it!
 -			if(recordholder == e.netname)
++			if (autocvar_g_race_cptimes_onlyself)
++			{
++				// return their own checkpoint time
++				recordtime = e.race_checkpoint_record[cp];
  				recordholder = "";
- 			} else {
++			}
++			else
++			{
 +				recordtime = race_checkpoint_records[cp];
 +				// make a tempstring copy, as we'll possibly strunzone it
 +				recordholder = strcat(race_checkpoint_recordholders[cp]);
 +
 +				if(recordholder == e.netname)
 +					recordholder = "";
 +			}
+ 
  			if(t != 0)
  			{
  				if(cp == race_timed_checkpoint)