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

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / trigger / jumppads.qh

diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qh b/qcsrc/common/mapobjects/trigger/jumppads.qh
index 3f63fc8f455d4b325ce73daacd10f321436b83e4..b632fe752c80af08963713ce04e7bd1477f0857b 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/jumppads.qh
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qh
@@ -3,7 +3,7 @@
 
 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)