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

diff --cc qcsrc/common/mapobjects/trigger/jumppads.qc
Simple merge

diff --cc qcsrc/common/mapobjects/trigger/jumppads.qh
index 70845017c62051bda45c425400e10bc8a675cdfd,e655c08d77eb7cb1cab8afbdb58ff73ade07ed4a..3f63fc8f455d4b325ce73daacd10f321436b83e4
--- 1/qcsrc/common/mapobjects/trigger/jumppads.qh
--- 2/qcsrc/common/mapobjects/trigger/jumppads.qh
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qh
@@@ -3,15 -3,14 +3,15 @@@
  
  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);
  
- const int PUSH_VELOCITY_PLAYERDIR_XY = BIT(0);
- const int PUSH_VELOCITY_ADD_XY = BIT(1);
- const int PUSH_VELOCITY_PLAYERDIR_Z = BIT(2);
- const int PUSH_VELOCITY_ADD_Z = BIT(3);
- const int PUSH_VELOCITY_BIDIRECTIONAL_XY = BIT(4);
- const int PUSH_VELOCITY_BIDIRECTIONAL_Z = BIT(5);
- const int PUSH_VELOCITY_CLAMP_NEGATIVE_ADDS = BIT(6);
+ #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(); }