Merge branch 'master' into terencehill/infomessages_panel_update

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / turret / hellion_weapon.qc

diff --git a/qcsrc/common/turrets/turret/hellion_weapon.qc b/qcsrc/common/turrets/turret/hellion_weapon.qc
index 0b112f22609178d55ebecb76a976187aaa92731e..9e737ea6cf12e921fb2e48828b739ef382a5f0e3 100644 (file)
--- a/qcsrc/common/turrets/turret/hellion_weapon.qc
+++ b/qcsrc/common/turrets/turret/hellion_weapon.qc
@@ -55,11 +55,11 @@ void turret_hellion_missile_think(entity this)
         turret_projectile_explode(this);
 
     // Enemy dead? just keep on the current heading then.
-    if ((this.enemy == world) || (IS_DEAD(this.enemy)))
+    if ((this.enemy == NULL) || (IS_DEAD(this.enemy)))
     {
 
         // Make sure we dont return to tracking a respawned player
-        this.enemy = world;
+        this.enemy = NULL;
 
         // Turn model
         this.angles = vectoangles(this.velocity);