Merge branch 'master' into TimePath/csqc_sounds

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / effects / effectinfo.qc

diff --git a/qcsrc/common/effects/effectinfo.qc b/qcsrc/common/effects/effectinfo.qc
index deff4dc1563ba74d61d0ba3f7abf912a1d3466d1..f4df3237d4e5ef046bb5909e84652004d2da9f59 100644 (file)
--- a/qcsrc/common/effects/effectinfo.qc
+++ b/qcsrc/common/effects/effectinfo.qc
@@ -319,11 +319,12 @@ GENERIC_COMMAND(dumpeffectinfo, "Dump all effectinfo to effectinfo_dump.txt")
 }
 
 
-REGISTRY(EffectInfos, BIT(9))
-REGISTER_REGISTRY(RegisterEffectInfos)
+REGISTRY(EffectInfos, BITS(9))
+#define EffectInfos_from(i) _EffectInfos_from(i, NULL)
+REGISTER_REGISTRY(EffectInfos)
 #define EFFECTINFO(name) \
     [[accumulate]] void effectinfo_##name(EffectInfoGroup parent, EffectInfo this) { } \
-    REGISTER(RegisterEffectInfos, EFFECTINFO, EffectInfos, name, m_id, NEW(EffectInfoGroup)) { \
+    REGISTER(EffectInfos, EFFECTINFO, name, m_id, NEW(EffectInfoGroup)) { \
         effectinfo_##name(this, NULL); \
     }