s/world/NULL/

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

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index b7d471f5a3ab96831e61427a050aab8f9196824d..9262698daa6c09a8f63840bb05ecf88ce5528499 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -234,7 +234,7 @@ void Arc_Player_SetHeat(entity player)
 void W_Arc_Bolt_Explode(entity this)
 {
        this.event_damage = func_null;
-       RadiusDamage(this, this.realowner, WEP_CVAR(arc, bolt_damage), WEP_CVAR(arc, bolt_edgedamage), WEP_CVAR(arc, bolt_radius), world, world, WEP_CVAR(arc, bolt_force), this.projectiledeathtype, other);
+       RadiusDamage(this, this.realowner, WEP_CVAR(arc, bolt_damage), WEP_CVAR(arc, bolt_edgedamage), WEP_CVAR(arc, bolt_radius), NULL, NULL, WEP_CVAR(arc, bolt_force), this.projectiledeathtype, other);
 
        remove(this);
 }
@@ -371,7 +371,7 @@ void W_Arc_Beam_Think(entity this)
                        }
                }
 
-               if(this == this.owner.arc_beam) { this.owner.arc_beam = world; }
+               if(this == this.owner.arc_beam) { this.owner.arc_beam = NULL; }
                entity own = this.owner;
                Weapon w = WEP_ARC;
                if(!w.wr_checkammo1(w, own) && !w.wr_checkammo2(w, own))
@@ -965,10 +965,10 @@ void Draw_ArcBeam_callback(vector start, vector hit, vector end)
 void Reset_ArcBeam()
 {
        entity e;
-       for (e = world; (e = findfloat(e, beam_usevieworigin, 1)); ) {
+       for (e = NULL; (e = findfloat(e, beam_usevieworigin, 1)); ) {
                e.beam_initialized = false;
        }
-       for (e = world; (e = findfloat(e, beam_usevieworigin, 2)); ) {
+       for (e = NULL; (e = findfloat(e, beam_usevieworigin, 2)); ) {
                e.beam_initialized = false;
        }
 }
@@ -1193,8 +1193,8 @@ void Draw_ArcBeam(entity this)
                        '0 0 0',
                        new_origin,
                        MOVE_NORMAL,
-                       world,
-                       world,
+                       NULL,
+                       NULL,
                        Draw_ArcBeam_callback
                );
 
@@ -1260,7 +1260,7 @@ void Draw_ArcBeam(entity this)
        }
 
        // cleanup
-       Draw_ArcBeam_callback_entity = world;
+       Draw_ArcBeam_callback_entity = NULL;
        Draw_ArcBeam_callback_last_thickness = 0;
        Draw_ArcBeam_callback_last_top = '0 0 0';
        Draw_ArcBeam_callback_last_bottom = '0 0 0';
@@ -1279,7 +1279,7 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew)
 
        if(isnew)
        {
-               int gunalign = W_GetGunAlignment(world);
+               int gunalign = W_GetGunAlignment(NULL);
 
                this.beam_shotorigin = arc_shotorigin[gunalign];