From: Nick S <nick@teichisma.info>
Date: Wed, 15 Feb 2023 18:34:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/Juhu/q3_jumppads' into morosophos/server-current4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e17fb896acbe25d61a9bf87af3daa2c10db1560;p=xonotic%2Fxonotic-data.pk3dir.git

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

6e17fb896acbe25d61a9bf87af3daa2c10db1560
diff --cc qcsrc/common/mapobjects/trigger/jumppads.qh
index 3f63fc8f4,b84ed450b..b632fe752
--- a/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(); }