X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fbuffs%2Fbuffs.qh;h=b381db4be19a6f0d9c8338f4f406d7f2f3a6e868;hp=d6cf1ca82e0fa4a4b77b86efe26e77ffdbfebb5a;hb=3c1e56f26fd675c3606d34b3afa94e3889ff4350;hpb=fcd31ea01083f448ef36785ad0bdb4244927fa42

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh
index d6cf1ca82..b381db4be 100644
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh
@@ -3,6 +3,10 @@
 #include <common/teams.qh>
 #include <common/util.qh>
 
+#ifdef GAMEQC
+#include <common/mutators/mutator/waypoints/all.qh>
+#endif
+
 #ifdef GAMEQC
 REGISTER_WAYPOINT(Buff, _("Buff"), "", '1 0.5 0', 1);
 REGISTER_RADARICON(Buff, 1);
@@ -20,13 +24,13 @@ REGISTRY_CHECK(Buffs)
 CLASS(Buff, Pickup)
 	/** bit index */
 	ATTRIB(Buff, m_itemid, int, 0);
-	ATTRIB(Buff, m_name, string, "buff");
+	ATTRIB(Buff, netname, string, "buff");
 	ATTRIB(Buff, m_color, vector, '1 1 1');
-	ATTRIB(Buff, m_prettyName, string, "Buff");
+	ATTRIB(Buff, m_name, string, "Buff");
 	ATTRIB(Buff, m_skin, int, 0);
 	ATTRIB(Buff, m_sprite, string, "");
 	METHOD(Buff, display, void(entity this, void(string name, string icon) returns)) {
-		returns(this.m_prettyName, sprintf("/gfx/hud/%s/buff_%s", cvar_string("menu_skin"), this.m_name));
+		returns(this.m_name, sprintf("/gfx/hud/%s/buff_%s", cvar_string("menu_skin"), this.netname));
 	}
 #ifdef SVQC
 	METHOD(Buff, m_time, float(Buff this))
@@ -35,11 +39,10 @@ CLASS(Buff, Pickup)
 ENDCLASS(Buff)
 
 STATIC_INIT(REGISTER_BUFFS) {
-    FOREACH(Buffs, true, {
-        it.netname = it.m_name; \
-        it.m_itemid = BIT(it.m_id - 1); \
-        it.m_sprite = strzone(strcat("buff-", it.m_name)); \
-    });
+	FOREACH(Buffs, true, {
+		it.m_itemid = BIT(it.m_id - 1);
+		it.m_sprite = strzone(strcat("buff-", it.netname));
+	});
 }
 
 #ifdef SVQC
@@ -64,6 +67,7 @@ STATIC_INIT(REGISTER_BUFFS) {
 #endif
 
 string Buff_UndeprecateName(string buffname);
+entity buff_FirstFromFlags(int _buffs);
 
 REGISTER_BUFF(Null);
 BUFF_SPAWNFUNCS(random, BUFF_Null)