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

diff --cc qcsrc/common/mapobjects/trigger/jumppads.qh
index 3f63fc8f455d4b325ce73daacd10f321436b83e4,b84ed450b9850c4a133c3db4f3de93c1f094f1a9..b632fe752c80af08963713ce04e7bd1477f0857b
--- 1/qcsrc/common/mapobjects/trigger/jumppads.qh
--- 2/qcsrc/common/mapobjects/trigger/jumppads.qh
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qh
@@@ -3,16 -3,8 +3,16 @@@
  
  const int PUSH_ONCE = BIT(0); // legacy, deactivate with relay instead
  const int PUSH_SILENT = BIT(1); // not used?
- const int PUSH_STATIC = BIT(12);
+ #define PUSH_STATIC BIT(12) // xonotic-only, Q3 already behaves like this by default
  
 +#define PUSH_VELOCITY_PLAYERDIR_XY        BIT(0)
 +#define PUSH_VELOCITY_ADD_XY              BIT(1)
 +#define PUSH_VELOCITY_PLAYERDIR_Z         BIT(2)
 +#define PUSH_VELOCITY_ADD_Z               BIT(3)
 +#define PUSH_VELOCITY_BIDIRECTIONAL_XY    BIT(4)
 +#define PUSH_VELOCITY_BIDIRECTIONAL_Z     BIT(5)
 +#define PUSH_VELOCITY_CLAMP_NEGATIVE_ADDS BIT(6)
 +
  IntrusiveList g_jumppads;
  STATIC_INIT(g_jumppads) { g_jumppads = IL_NEW(); }