s/world/NULL/

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / devastator.qc

diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc
index bc4b609bf2b692154f840149eea1797e6611c06c..f2ca4265545d9dd31dce6d1650978699f069764a 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@ -76,7 +76,7 @@ void W_Devastator_Unregister(entity this)
 {
        if(this.realowner && this.realowner.lastrocket == this)
        {
-               this.realowner.lastrocket = world;
+               this.realowner.lastrocket = NULL;
                // this.realowner.rl_release = 1;
        }
 }
@@ -101,8 +101,8 @@ void W_Devastator_Explode(entity this)
                WEP_CVAR(devastator, damage),
                WEP_CVAR(devastator, edgedamage),
                WEP_CVAR(devastator, radius),
-               world,
-               world,
+               NULL,
+               NULL,
                WEP_CVAR(devastator, force),
                this.projectiledeathtype,
                other
@@ -164,11 +164,11 @@ void W_Devastator_DoRemoteExplode(entity this, .entity weaponentity)
                                        WEP_CVAR(devastator, remote_jump_damage),
                                        WEP_CVAR(devastator, remote_jump_damage),
                                        WEP_CVAR(devastator, remote_jump_radius),
-                                       world,
+                                       NULL,
                                        head,
                                        0,
                                        this.projectiledeathtype | HITTYPE_BOUNCE,
-                                       world
+                                       NULL
                                );
                                break;
                        }
@@ -182,11 +182,11 @@ void W_Devastator_DoRemoteExplode(entity this, .entity weaponentity)
                WEP_CVAR(devastator, remote_damage),
                WEP_CVAR(devastator, remote_edgedamage),
                WEP_CVAR(devastator, remote_radius),
-               (handled_as_rocketjump ? head : world),
-               world,
+               (handled_as_rocketjump ? head : NULL),
+               NULL,
                WEP_CVAR(devastator, remote_force),
                this.projectiledeathtype | HITTYPE_BOUNCE,
-               world
+               NULL
        );
 
        Weapon thiswep = WEP_DEVASTATOR;
@@ -259,7 +259,7 @@ void W_Devastator_Think(entity this)
        this.nextthink = time;
        if(time > this.cnt)
        {
-               other = world;
+               other = NULL;
                this.projectiledeathtype |= HITTYPE_BOUNCE;
                W_Devastator_Explode(this);
                return;
@@ -412,7 +412,7 @@ METHOD(Devastator, wr_aim, void(entity thiswep, entity actor))
         // decide whether to detonate rockets
         entity missile, targetlist, targ;
         targetlist = findchainfloat(bot_attack, true);
-        for(missile = world; (missile = find(missile, classname, "rocket")); ) if(missile.realowner == actor)
+        for(missile = NULL; (missile = find(missile, classname, "rocket")); ) if(missile.realowner == actor)
         {
             targ = targetlist;
             while(targ)
@@ -540,7 +540,7 @@ METHOD(Devastator, wr_think, void(entity thiswep, entity actor, .entity weaponen
         {
             entity rock;
             bool rockfound = false;
-            for(rock = world; (rock = find(rock, classname, "rocket")); ) if(rock.realowner == actor)
+            for(rock = NULL; (rock = find(rock, classname, "rocket")); ) if(rock.realowner == actor)
             {
                 if(!rock.rl_detonate_later)
                 {