Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/dpdefs/dpextensions.qh b/qcsrc/dpdefs/dpextensions.qh
index 2487da4ff357a8751c3ab8e643ce0168ad02c47a..7b437082f191096ac3aadd7b2bfc6583b50c3eae 100644 (file)
--- a/qcsrc/dpdefs/dpextensions.qh
+++ b/qcsrc/dpdefs/dpextensions.qh
@@ -3,13 +3,16 @@
 
 #pragma noref 1
 
+#define particleeffectnum __particleeffectnum
+
 #include "upstream/dpextensions.qc"
 
+#undef particleeffectnum
+
 int(entity ent, string tagname) _gettagindex = #451;
 #define gettagindex _gettagindex
 
 int(string effectname) _particleeffectnum = #335;
-#define particleeffectnum _particleeffectnum
 
 int(string s, string separator1, ...) _tokenizebyseparator = #479;
 #define tokenizebyseparator _tokenizebyseparator