Merge branch 'master' into Mario/csqc_muzzleflash

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

diff --git a/qcsrc/common/effects/all.qh b/qcsrc/common/effects/all.qh
index da5ab498b8059160def04481e0710fc90d96156b..525336377683936185575b745add520e730c8522 100644 (file)
--- a/qcsrc/common/effects/all.qh
+++ b/qcsrc/common/effects/all.qh
@@ -9,11 +9,11 @@ void Send_Effect_(string eff_name, vector eff_loc, vector eff_vel, int eff_cnt);
 #endif
 
 REGISTRY(Effects, BITS(8))
 #endif
 
 REGISTRY(Effects, BITS(8))

-#define Effects_from(i) _Effects_from(i, EFFECT_Null)

 REGISTER_REGISTRY(Effects)
 REGISTRY_CHECK(Effects)
 #define EFFECT(istrail, name, realname) \
     REGISTER(Effects, EFFECT, name, m_id, Create_Effect_Entity(realname, istrail));
 
 EFFECT(0, Null, string_null)
 REGISTER_REGISTRY(Effects)
 REGISTRY_CHECK(Effects)
 #define EFFECT(istrail, name, realname) \
     REGISTER(Effects, EFFECT, name, m_id, Create_Effect_Entity(realname, istrail));
 
 EFFECT(0, Null, string_null)

+REGISTRY_DEFINE_GET(Effects, EFFECT_Null)

 #include "all.inc"
 #include "all.inc"