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 c4d8c54ce05c4b6b847a36f54d1d6672beda0379..f48df8e5ccd3c1218334bd1bc825708f8382161c 100644 (file)
--- a/qcsrc/dpdefs/csprogsdefs.qh
+++ b/qcsrc/dpdefs/csprogsdefs.qh
@@ -8,6 +8,10 @@
 #define TRUE _TRUE
 #define FALSE _FALSE
 
+#define spawn _spawn
+
+#define particleeffectnum _particleeffectnum
+
 #include "upstream/csprogsdefs.qc"
 
 #undef true
@@ -15,6 +19,12 @@
 #undef TRUE
 #undef FALSE
 
+#undef spawn
+
+#undef particleeffectnum
+
 #pragma noref 0
 
+#define ReadFloat() ReadCoord()
+
 #endif