Merge branch 'terencehill/ca_msg_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_quake3.qc

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 8eecc5ee3ba67d16d14204ca3776eee16adcd6b1..ef614c7ac3eaf55885ae4bb8d99246e8ac9d09f3 100644 (file)
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -1,7 +1,6 @@
-#include "_all.qh"
+#include "t_quake3.qh"
 
 #include "../common/weapons/all.qh"
-#include "../common/buffs.qh"
 
 spawnfunc(weapon_crylink);
 spawnfunc(weapon_electro);
@@ -65,8 +64,11 @@ 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()
+void target_init_verify(entity this)
 {
        entity trigger, targ;
        for(trigger = world; (trigger = find(trigger, classname, "trigger_multiple")); )
@@ -93,8 +95,8 @@ spawnfunc(target_init)
 }
 
 // weapon give ent from defrag
-void target_give_init()
-{SELFPARAM();
+void target_give_init(entity this)
+{
        entity targ;
        for (targ = world; (targ = find(targ, targetname, self.target)); ) {
                if (targ.classname == "weapon_rocketlauncher" || targ.classname == "weapon_devastator") {
@@ -127,7 +129,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 +142,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 +155,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;