From: Nick S <nick@teichisma.info>
Date: Thu, 16 Feb 2023 19:32:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into morosophos/server-current4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e581f20769fa375e3f3fb8eb9e06ba5628f33a53;p=xonotic%2Fxonotic-data.pk3dir.git

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

e581f20769fa375e3f3fb8eb9e06ba5628f33a53
diff --cc qcsrc/common/stats.qh
index 3e51fb26d,c093b6282..641aec739
--- a/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"