X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_quake3.qc;h=4ea7a33485f420984dba9e2bdb3fe318344ebd51;hb=4ce007470c1496a3ff4574075281e6912019e533;hp=8eecc5ee3ba67d16d14204ca3776eee16adcd6b1;hpb=1af8ea71282d19f66c96622815c68943eaa36aba;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 8eecc5ee3..4ea7a3348 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -1,7 +1,5 @@
-#include "_all.qh"
 
 #include "../common/weapons/all.qh"
-#include "../common/buffs.qh"
 
 spawnfunc(weapon_crylink);
 spawnfunc(weapon_electro);
@@ -65,6 +63,9 @@ spawnfunc(item_armor_combat)   { spawnfunc_item_armor_big(this);      }
 spawnfunc(item_armor_shard)    { spawnfunc_item_armor_small(this);    }
 spawnfunc(item_enviro)         { spawnfunc_item_invincible(this);     }
 
+.float wait;
+.float delay;
+
 // weapon remove ent from df
 void target_init_verify()
 {
@@ -127,7 +128,7 @@ void target_give_init()
 		else if (targ.classname == "item_health_mega")
 			self.health = 200;
 		//remove(targ); // removing ents in init functions causes havoc, workaround:
-        targ.think = SUB_Remove;
+        targ.think = SUB_Remove_self;
         targ.nextthink = time;
 	}
 	self.spawnflags = 2;
@@ -140,7 +141,7 @@ spawnfunc(target_give)
 	InitializeEntity(self, target_give_init, INITPRIO_FINDTARGET);
 }
 
-//spawnfunc(item_flight)       /* handled by buffs mutator or jetpack */
+//spawnfunc(item_flight)       /* handled by jetpack */
 //spawnfunc(item_haste)        /* handled by buffs mutator */
 //spawnfunc(item_health)       /* handled in t_quake.qc */
 //spawnfunc(item_health_large) /* handled in t_items.qc */
@@ -153,10 +154,7 @@ spawnfunc(target_give)
 
 spawnfunc(item_flight)
 {
-	if(!cvar("g_buffs") || !cvar("g_buffs_flight"))
-		spawnfunc_item_jetpack(this);
-	else
-		buff_Init_Compat(self, BUFF_FLIGHT);
+	spawnfunc_item_jetpack(this);
 }
 
 .float notteam;