Makefile: use `-I.`

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

diff --git a/qcsrc/common/mutators/mutator/buffs/all.qh b/qcsrc/common/mutators/mutator/buffs/all.qh
index 94a00b9de76bd8ea19a02fe009ad493f1e153066..d34d32d071ef10f42c1d9f26ec12d6e8ff4a130e 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/all.qh
+++ b/qcsrc/common/mutators/mutator/buffs/all.qh
@@ -5,8 +5,8 @@
 // Add new buffs here!
 // Note: Buffs also need spawnfuncs, which are set below
 
-#include "../../../teams.qh"
-#include "../../../util.qh"
+#include <common/teams.qh>
+#include <common/util.qh>
 
 REGISTER_WAYPOINT(Buff, _("Buff"), '1 0.5 0', 1);
 REGISTER_RADARICON(Buff, 1);
@@ -17,15 +17,15 @@ REGISTER_REGISTRY(Buffs)
 REGISTRY_CHECK(Buffs)
 
 #define REGISTER_BUFF(id) \
-    REGISTER(Buffs, BUFF, id, m_id, NEW(Buff)); \
-    REGISTER_INIT_POST(BUFF, id) { \
+    REGISTER(Buffs, BUFF_##id, m_id, NEW(Buff)); \
+    REGISTER_INIT_POST(BUFF_##id) { \
         this.netname = this.m_name; \
         this.m_itemid = BIT(this.m_id - 1); \
         this.m_sprite = strzone(strcat("buff-", this.m_name)); \
     } \
-    REGISTER_INIT(BUFF, id)
+    REGISTER_INIT(BUFF_##id)
 
-#include "../../../items/item/pickup.qh"
+#include <common/items/item/pickup.qh>
 CLASS(Buff, Pickup)
        /** bit index */
        ATTRIB(Buff, m_itemid, int, 0)
@@ -44,7 +44,7 @@ CLASS(Buff, Pickup)
 ENDCLASS(Buff)
 
 #ifdef SVQC
-       .int buffs;
+       // .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) { \