Merge branch 'master' into Mario/csqc_muzzleflash

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / effects / effect.qh

diff --git a/qcsrc/common/effects/effect.qh b/qcsrc/common/effects/effect.qh
index bc8f8483e3a2fcee09c17973489b0d43eb67369a..7802f0a91be3f3ad464e41b69ad62d1a2b09c0da 100644 (file)
--- a/qcsrc/common/effects/effect.qh
+++ b/qcsrc/common/effects/effect.qh
@@ -1,7 +1,20 @@
-#ifndef EFFECT_H
-#define EFFECT_H
+#pragma once
 
-#define particleeffectnum(e) _particleeffectnum(e.eent_eff_name)
+#define particleeffectnum(e) \
+       _particleeffectnum(e.eent_eff_name)
+
+#if defined(SVQC)
+       #define pointparticles(effect, org, vel, howmany) \
+               Send_Effect(effect, org, vel, howmany)
+       #define trailparticles(e, effect, org, vel) \
+               ((!e) ? Send_Effect(effect, org, vel, 0) \
+               : __trailparticles(e, particleeffectnum(effect), org, vel))
+#elif defined(CSQC)
+       #define pointparticles(effect, org, vel, howmany) \
+               __pointparticles(particleeffectnum(effect), org, vel, howmany)
+       #define trailparticles(e, effect, org, vel) \
+               __trailparticles(e, particleeffectnum(effect), org, vel)
+#endif
 
 .int m_id;
 .string eent_eff_name;
@@ -13,11 +26,8 @@
 
 entity Create_Effect_Entity(string eff_name, bool eff_trail)
 {
-       entity this = new(effect_entity);
-       make_pure(this);
+       entity this = new_pure(effect_entity);
        this.eent_eff_name = eff_name;
        this.eent_eff_trail = eff_trail;
        return this;
 }
-
-#endif