Merge branch 'master' into TimePath/debug_draw

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

diff --git a/qcsrc/dpdefs/csprogsdefs.qh b/qcsrc/dpdefs/csprogsdefs.qh
index b10ef09baf75fadba2367fb6f5225c8bcec58b90..6f9c9d637ff3a927faae655e701e09d7c73d22a9 100644 (file)
--- a/qcsrc/dpdefs/csprogsdefs.qh
+++ b/qcsrc/dpdefs/csprogsdefs.qh
@@ -9,6 +9,10 @@
 #define FALSE _FALSE
 
 #define spawn _spawn
+#define particleeffectnum _particleeffectnum
+#define trailparticles __trailparticles
+#define pointparticles __pointparticles
+#define setmodel _setmodel
 
 #include "upstream/csprogsdefs.qc"
 
@@ -18,7 +22,13 @@
 #undef FALSE
 
 #undef spawn
+#undef particleeffectnum
+#undef trailparticles
+#undef pointparticles
+#undef setmodel
 
 #pragma noref 0
 
+#define ReadFloat() ReadCoord()
+
 #endif