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

diff --cc qcsrc/common/stats.qh
index 3e51fb26da1d4dbcf9e5e32740cdf5e8c93b4ac7,c093b62826d020269e45b7792c642bf56bc65341..641aec73981e2c9b889caeb1062d2df1264631ea
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -354,11 -354,13 +354,17 @@@ bool autocvar_sv_slick_applygravity
  #endif
  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)
+ // FIXME: workaround for https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2812
+ #ifdef SVQC
+       #define Q3COMPAT_COMMON q3compat
+ #elif defined(CSQC)
+       #define Q3COMPAT_COMMON STAT(Q3COMPAT)
+ #endif
  
  #ifdef SVQC
  #include "physics/movetypes/movetypes.qh"