Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/dpdefs/csprogsdefs.qh b/qcsrc/dpdefs/csprogsdefs.qh
index b10ef09baf75fadba2367fb6f5225c8bcec58b90..f48df8e5ccd3c1218334bd1bc825708f8382161c 100644 (file)
--- a/qcsrc/dpdefs/csprogsdefs.qh
+++ b/qcsrc/dpdefs/csprogsdefs.qh
@@ -10,6 +10,8 @@
 
 #define spawn _spawn
 
+#define particleeffectnum _particleeffectnum
+
 #include "upstream/csprogsdefs.qc"
 
 #undef true
@@ -19,6 +21,10 @@
 
 #undef spawn
 
+#undef particleeffectnum
+
 #pragma noref 0
 
+#define ReadFloat() ReadCoord()
+
 #endif