Merge branch 'master' into Mario/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / dpdefs / csprogsdefs.qh

diff --git a/qcsrc/dpdefs/csprogsdefs.qh b/qcsrc/dpdefs/csprogsdefs.qh
index 6ad27242aaf3f6a22161d17db4f4e3bd44d3575a..f424d1a5de4dcfec5323851cabb41a712eed6adb 100644 (file)
--- a/qcsrc/dpdefs/csprogsdefs.qh
+++ b/qcsrc/dpdefs/csprogsdefs.qh
@@ -10,8 +10,16 @@
 
 #define spawn _spawn
 #define particleeffectnum _particleeffectnum
+#define trailparticles __trailparticles
+#define pointparticles __pointparticles
 #define setmodel _setmodel
 
+#define STAT_FRAGLIMIT _STAT_FRAGLIMIT
+#define STAT_TIMELIMIT _STAT_TIMELIMIT
+#define STAT_MOVEVARS_TICRATE _STAT_MOVEVARS_TICRATE
+#define STAT_MOVEVARS_TIMESCALE _STAT_MOVEVARS_TIMESCALE
+#define STAT_MOVEVARS_GRAVITY _STAT_MOVEVARS_GRAVITY
+
 #include "upstream/csprogsdefs.qc"
 
 #undef true
@@ -21,10 +29,20 @@
 
 #undef spawn
 #undef particleeffectnum
+#undef trailparticles
+#undef pointparticles
 #undef setmodel
 
+#undef STAT_FRAGLIMIT
+#undef STAT_TIMELIMIT
+#undef STAT_MOVEVARS_TICRATE
+#undef STAT_MOVEVARS_TIMESCALE
+#undef STAT_MOVEVARS_GRAVITY
+
 #pragma noref 0
 
-#define ReadFloat() ReadCoord()
+#define use use1
+.void(entity this, entity actor, entity trigger) use;
+#define touch move_touch
 
 #endif