Merge branch 'master' into terencehill/spectatee_status_update

[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 921da4f3a28f0b37ce52db585d9fbce10eae97f4..1e71d33445cb22026ab772cd914f3911a34f7c35 100644 (file)
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -1,6 +1,6 @@
 #include "t_quake3.qh"
 
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 
 spawnfunc(weapon_crylink);
 spawnfunc(weapon_electro);
@@ -71,8 +71,8 @@ spawnfunc(item_enviro)         { spawnfunc_item_invincible(this);     }
 void target_init_verify(entity this)
 {
        entity trigger, targ;
-       for(trigger = world; (trigger = find(trigger, classname, "trigger_multiple")); )
-               for(targ = world; (targ = find(targ, targetname, trigger.target)); )
+       for(trigger = NULL; (trigger = find(trigger, classname, "trigger_multiple")); )
+               for(targ = NULL; (targ = find(targ, targetname, trigger.target)); )
                        if (targ.classname == "target_init" || targ.classname == "target_give" || targ.classname == "target_items")
                        {
                                trigger.wait = 0;
@@ -98,7 +98,7 @@ spawnfunc(target_init)
 void target_give_init(entity this)
 {
        entity targ;
-       for (targ = world; (targ = find(targ, targetname, this.target)); ) {
+       for (targ = NULL; (targ = find(targ, targetname, this.target)); ) {
                if (targ.classname == "weapon_rocketlauncher" || targ.classname == "weapon_devastator") {
                        this.ammo_rockets += targ.count * WEP_CVAR(devastator, ammo);
                        this.netname = "devastator";
@@ -129,7 +129,7 @@ void target_give_init(entity this)
                else if (targ.classname == "item_health_mega")
                        this.health = 200;
                //remove(targ); // removing ents in init functions causes havoc, workaround:
-        setthink(targ, SUB_Remove_self);
+        setthink(targ, SUB_Remove);
         targ.nextthink = time;
        }
        this.spawnflags = 2;