Resolve conflicts 2: Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / buffs / buffs.qh

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh
index 14a8ea01d0f5aced3625820ae4891e9131557289..9851cd8f7a55c9988b2470bc320b25f6a7c41463 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh
@@ -4,6 +4,7 @@
 #include <common/util.qh>
 
 #ifdef GAMEQC
+#include <common/items/item.qh>
 #include <common/mutators/mutator/waypoints/all.qh>
 #endif
 
@@ -12,13 +13,14 @@ REGISTER_WAYPOINT(Buff, _("Buff"), "", '1 0.5 0', 1);
 REGISTER_RADARICON(Buff, 1);
 #endif
 
-#define REGISTER_BUFF(id) \
-    REGISTER(StatusEffect, BUFF_##id, m_id, NEW(Buff))
+#define REGISTER_BUFF(id, inst) \
+    REGISTER(StatusEffect, BUFF_##id, m_id, inst)
 
 #include <common/mutators/mutator/status_effects/_mod.qh>
 CLASS(Buff, StatusEffects)
-       /** bit index */
-       ATTRIB(Buff, m_itemid, int, 0);
+#ifdef GAMEQC
+       ATTRIB(Buff, m_itemid, int, IT_BUFF);
+#endif
        ATTRIB(Buff, netname, string, "buff");
        ATTRIB(Buff, m_icon, string, "buff");
        ATTRIB(Buff, m_color, vector, '1 1 1');
@@ -37,7 +39,6 @@ ENDCLASS(Buff)
 
 STATIC_INIT(REGISTER_BUFFS) {
        FOREACH(StatusEffect, it.instanceOfBuff, {
-               it.m_itemid = BIT(it.m_id - 1);
                it.m_sprite = strzone(strcat("buff-", it.netname));
        });
 }