Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / unit / flac.qc

diff --git a/qcsrc/common/turrets/unit/flac.qc b/qcsrc/common/turrets/unit/flac.qc
index 8068ab1d7e8d97c49ecb22ad90932cec40d33844..614df1d2f072aa133c8b7a15a0b7f75e97d8162d 100644 (file)
--- a/qcsrc/common/turrets/unit/flac.qc
+++ b/qcsrc/common/turrets/unit/flac.qc
@@ -13,90 +13,90 @@ REGISTER_TURRET(
 #ifdef SVQC
 void turret_flac_projectile_think_explode()
 {
-       if(self.enemy != world)
-       if(vlen(self.origin - self.enemy.origin) < self.owner.shot_radius * 3)
-               setorigin(self,self.enemy.origin + randomvec() * self.owner.shot_radius);
+    if(self.enemy != world)
+    if(vlen(self.origin - self.enemy.origin) < self.owner.shot_radius * 3)
+        setorigin(self,self.enemy.origin + randomvec() * self.owner.shot_radius);
 
 #ifdef TURRET_DEBUG
-       float d;
-       d = RadiusDamage (self, self.owner, self.owner.shot_dmg, self.owner.shot_dmg, self.owner.shot_radius, self, world, self.owner.shot_force, self.totalfrags, world);
-       self.owner.tur_dbg_dmg_t_h = self.owner.tur_dbg_dmg_t_h + d;
-       self.owner.tur_dbg_dmg_t_f = self.owner.tur_dbg_dmg_t_f + self.owner.shot_dmg;
+    float d;
+    d = RadiusDamage (self, self.owner, self.owner.shot_dmg, self.owner.shot_dmg, self.owner.shot_radius, self, world, self.owner.shot_force, self.totalfrags, world);
+    self.owner.tur_dbg_dmg_t_h = self.owner.tur_dbg_dmg_t_h + d;
+    self.owner.tur_dbg_dmg_t_f = self.owner.tur_dbg_dmg_t_f + self.owner.shot_dmg;
 #else
-       RadiusDamage (self, self.realowner, self.owner.shot_dmg, self.owner.shot_dmg, self.owner.shot_radius, self, world, self.owner.shot_force, self.totalfrags, world);
+    RadiusDamage (self, self.realowner, self.owner.shot_dmg, self.owner.shot_dmg, self.owner.shot_radius, self, world, self.owner.shot_force, self.totalfrags, world);
 #endif
-       remove(self);
+    remove(self);
 }
 
 void spawnfunc_turret_flac() { if(!turret_initialize(TUR_FLAC)) remove(self); }
 
 float t_flac(float req)
 {
-       switch(req)
-       {
-               case TR_ATTACK:
-               {
-                       entity proj;
+    switch(req)
+    {
+        case TR_ATTACK:
+        {
+            entity proj;
 
-                       turret_tag_fire_update();
+            turret_tag_fire_update();
 
-                       proj = turret_projectile("weapons/hagar_fire.wav", 5, 0, DEATH_TURRET_FLAC, PROJECTILE_HAGAR, TRUE, TRUE);
-                       pointparticles(particleeffectnum("laser_muzzleflash"), self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
-                       proj.think        = turret_flac_projectile_think_explode;
-                       proj.nextthink  = time + self.tur_impacttime + (random() * 0.01 - random() * 0.01);
-                       proj.missile_flags = MIF_SPLASH | MIF_PROXY;
+            proj = turret_projectile("weapons/hagar_fire.wav", 5, 0, DEATH_TURRET_FLAC, PROJECTILE_HAGAR, TRUE, TRUE);
+            Send_Effect("laser_muzzleflash", self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
+            proj.think   = turret_flac_projectile_think_explode;
+            proj.nextthink  = time + self.tur_impacttime + (random() * 0.01 - random() * 0.01);
+            proj.missile_flags = MIF_SPLASH | MIF_PROXY;
 
-                       self.tur_head.frame = self.tur_head.frame + 1;
-                       if (self.tur_head.frame >= 4)
-                               self.tur_head.frame = 0;
-                       
-                       return true;
-               }
-               case TR_THINK:
-               {
-                       return true;
-               }
-               case TR_DEATH:
-               {
-                       return true;
-               }
-               case TR_SETUP:
-               {
-                       self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
-                       self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE;
-                       self.damage_flags |= TFL_DMG_HEADSHAKE;
-                       self.target_select_flags |= TFL_TARGETSELECT_NOTURRETS | TFL_TARGETSELECT_MISSILESONLY;
-               
-                       return true;
-               }
-               case TR_PRECACHE:
-               {
-                       precache_model ("models/turrets/base.md3");
-                       precache_model ("models/turrets/flac.md3");
-                       return true;
-               }
-       }
+            self.tur_head.frame = self.tur_head.frame + 1;
+            if (self.tur_head.frame >= 4)
+                self.tur_head.frame = 0;
 
-       return true;
+            return true;
+        }
+        case TR_THINK:
+        {
+            return true;
+        }
+        case TR_DEATH:
+        {
+            return true;
+        }
+        case TR_SETUP:
+        {
+            self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
+            self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE;
+            self.damage_flags |= TFL_DMG_HEADSHAKE;
+            self.target_select_flags |= TFL_TARGETSELECT_NOTURRETS | TFL_TARGETSELECT_MISSILESONLY;
+
+            return true;
+        }
+        case TR_PRECACHE:
+        {
+            precache_model ("models/turrets/base.md3");
+            precache_model ("models/turrets/flac.md3");
+            return true;
+        }
+    }
+
+    return true;
 }
 
 #endif // SVQC
 #ifdef CSQC
 float t_flac(float req)
 {
-       switch(req)
-       {
-               case TR_SETUP:
-               {
-                       return true;
-               }
-               case TR_PRECACHE:
-               {
-                       return true;
-               }
-       }
+    switch(req)
+    {
+        case TR_SETUP:
+        {
+            return true;
+        }
+        case TR_PRECACHE:
+        {
+            return true;
+        }
+    }
 
-       return true;
+    return true;
 }
 
 #endif // CSQC