From: Nikolay S <nick@teichisma.info>
Date: Wed, 27 Nov 2024 18:26:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into morosophos/server-current4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22dd0713bfd06478c6091b34c47bd05e679810e1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into morosophos/server-current4
---

22dd0713bfd06478c6091b34c47bd05e679810e1
diff --cc qcsrc/common/stats.qh
index 2c4cb00d6,2b293dbc1..5a25e437d
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -356,13 -355,9 +355,13 @@@ REGISTER_STAT(SPECTATORSPEED, FLOAT
  #ifdef SVQC
  bool autocvar_sv_slick_applygravity;
  #endif
- REGISTER_STAT(SLICK_APPLYGRAVITY, bool, autocvar_sv_slick_applygravity)
+ REGISTER_STAT(SLICK_APPLYGRAVITY, BOOL, autocvar_sv_slick_applygravity)
  
 +#ifdef SVQC
 +int autocvar_sv_q3compat_jumppads;
 +#endif
- REGISTER_STAT(Q3COMPAT, int, q3compat)
- REGISTER_STAT(Q3COMPAT_JUMPPADS, int, autocvar_sv_q3compat_jumppads)
+ REGISTER_STAT(Q3COMPAT, INT, q3compat)
++REGISTER_STAT(Q3COMPAT_JUMPPADS, INT, autocvar_sv_q3compat_jumppads)
  // FIXME: workaround for https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2812
  #ifdef SVQC
  	#define Q3COMPAT_COMMON q3compat
diff --cc qcsrc/server/race.qc
index 955db3dd5,4cc4991bd..91b473a9b
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@@ -182,7 -164,7 +183,8 @@@ float race_checkpoint_lastlaps[MAX_CHEC
  entity race_checkpoint_lastplayers[MAX_CHECKPOINTS];
  
  .float race_checkpoint_record[MAX_CHECKPOINTS];
 +.float current_checkpoint_record[MAX_CHECKPOINTS];
+ .float race_checkpoint_recordspeed[MAX_CHECKPOINTS];
  
  float race_highest_checkpoint;
  float race_timed_checkpoint;
@@@ -848,12 -813,7 +870,12 @@@ void checkpoint_passed(entity this, ent
  			player.race_movetime = player.race_movetime_frac = player.race_movetime_count = 0;
  			player.race_penalty_accumulator = 0;
  			player.race_lastpenalty = NULL;
 -		}
 +		  for (int i=0; i < MAX_CHECKPOINTS; i++) {
 +				player.current_checkpoint_record[i] = 0;
 +			}
 +		} else {
- 		    player.current_checkpoint_record[this.race_checkpoint] = player.race_movetime; 
++		    player.current_checkpoint_record[this.race_checkpoint] = player.race_movetime;
 +	}
  
  		if(g_race_qualifying)
  			race_SendNextCheckpoint(player, 0);