Merge remote-tracking branch 'origin/samual/serverlist'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / tturrets / units / unit_tessla.qc

diff --git a/qcsrc/server/tturrets/units/unit_tessla.qc b/qcsrc/server/tturrets/units/unit_tessla.qc
index 85fb8bb18205bb367dd194b7e800ea9499d1c554..4989b2445efc99808dab32b75b29935cdd46e95a 100644 (file)
--- a/qcsrc/server/tturrets/units/unit_tessla.qc
+++ b/qcsrc/server/tturrets/units/unit_tessla.qc
@@ -35,7 +35,7 @@ entity toast(entity from, float range, float damage)
     }
 
     if (etarget)
-    {        
+    {
         te_csqc_lightningarc(from.origin,etarget.origin);
         Damage(etarget, self, self, damage, DEATH_TURRET_TESLA, etarget.origin, '0 0 0');
         etarget.railgunhit = 1;
@@ -47,8 +47,8 @@ entity toast(entity from, float range, float damage)
 float turret_tesla_firecheck()
 {
     // g_turrets_targetscan_maxdelay forces a target re-scan at least this often
-    float do_target_scan;
-    
+    float do_target_scan = 0;
+
     if((self.target_select_time + autocvar_g_turrets_targetscan_maxdelay) < time)
         do_target_scan = 1;
 
@@ -71,7 +71,7 @@ float turret_tesla_firecheck()
         self.target_select_time = time;
     }
 
-    if not (turret_stdproc_firecheck())
+    if (!turret_stdproc_firecheck())
         return 0;
 
     if(self.enemy)
@@ -86,8 +86,6 @@ void turret_tesla_fire()
     entity e, t;
     float d, r, i;
 
-    //w_deathtypestring = "discoverd how a tesla coil works";
-
     d = self.shot_dmg;
     r = self.target_range;
     e = spawn();
@@ -122,7 +120,7 @@ void turret_tesla_fire()
 
 void turret_tesla_postthink()
 {
-    if not (self.active)
+    if (!self.active)
     {
         self.tur_head.avelocity = '0 0 0';
         return;