X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fbuffs%2Fbuffs.qc;h=dbabdd2e2f49bc427b245329c593bf569be42f31;hb=1cbef966e133966c5b5f0f5b58fbd1a5851ed35b;hp=fbddd037bc140942d562f267f50c152dde95c8d0;hpb=229104225e03b92717b3b2760e6b6d2c5a2cddfe;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qc b/qcsrc/common/mutators/mutator/buffs/buffs.qc
index fbddd037b..dbabdd2e2 100644
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qc
@@ -75,7 +75,6 @@ const vector BUFF_MAX = ('16 16 20');
 
 #include "../../../triggers/target/music.qh"
 #include "../../../gamemodes/all.qh"
-#include "../../../buffs/all.qh"
 
 .float buff_time = _STAT(BUFF_TIME);
 void buffs_DelayedInit();
@@ -379,17 +378,17 @@ void buff_Waypoint_Reset()
 	if(self.buff_activetime) { buff_Waypoint_Spawn(self); }
 }
 
-void buff_Reset()
-{SELFPARAM();
+void buff_Reset(entity this)
+{
 	if(autocvar_g_buffs_randomize)
-		buff_NewType(self, self.buffs);
-	self.owner = world;
+		buff_NewType(this, this.buffs);
+	this.owner = world;
 	buff_SetCooldown(autocvar_g_buffs_cooldown_activate);
 	buff_Waypoint_Reset();
-	self.buff_activetime_updated = false;
+	this.buff_activetime_updated = false;
 
-	if(autocvar_g_buffs_random_location || (self.spawnflags & 64))
-		buff_Respawn(self);
+	if(autocvar_g_buffs_random_location || (this.spawnflags & 64))
+		buff_Respawn(this);
 }
 
 float buff_Customize()
@@ -786,6 +785,11 @@ MUTATOR_HOOKFUNCTION(buffs, CustomizeWaypoint)
 
 MUTATOR_HOOKFUNCTION(buffs, OnEntityPreSpawn, CBC_ORDER_LAST)
 {SELFPARAM();
+	if (self.classname == "item_flight" && cvar("g_buffs") && cvar("g_buffs_flight"))
+	{
+		buff_Init_Compat(self, BUFF_FLIGHT);
+		return true;
+	}
 	if(autocvar_g_buffs_replace_powerups)
 	switch(self.classname)
 	{