Merge branch 'master' into Lyberta/TeamplayOverhaul

[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 ae76d9f59ef6f9dc9e910389508d9f81a8417c21..35005e7a8fea65285d869afd82a8f247da833f78 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh
@@ -4,7 +4,7 @@
 #include <common/util.qh>
 
 #ifdef GAMEQC
-REGISTER_WAYPOINT(Buff, _("Buff"), '1 0.5 0', 1);
+REGISTER_WAYPOINT(Buff, _("Buff"), "", '1 0.5 0', 1);
 REGISTER_RADARICON(Buff, 1);
 #endif
 
@@ -43,11 +43,10 @@ STATIC_INIT(REGISTER_BUFFS) {
 }
 
 #ifdef SVQC
-       // .int buffs = _STAT(BUFFS);
        void buff_Init(entity ent);
        void buff_Init_Compat(entity ent, entity replacement);
        #define BUFF_SPAWNFUNC(e, b, t) spawnfunc(item_buff_##e) { \
-               this.buffs = b.m_itemid; \
+               STAT(BUFFS, this) = b.m_itemid; \
                this.team = t; \
                buff_Init(this); \
        }
@@ -64,6 +63,9 @@ STATIC_INIT(REGISTER_BUFFS) {
        #define BUFF_SPAWNFUNC_Q3TA_COMPAT(o, r)
 #endif
 
+string Buff_UndeprecateName(string buffname);
+entity buff_FirstFromFlags(int _buffs);
+
 REGISTER_BUFF(Null);
 BUFF_SPAWNFUNCS(random, BUFF_Null)