Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/common/turrets/unit/mlrs.qc b/qcsrc/common/turrets/unit/mlrs.qc
index 254a589484b0302606d130ddc4374c3765be8085..0142202157145a3bad5738b83553dfa29158d138 100644 (file)
--- a/qcsrc/common/turrets/unit/mlrs.qc
+++ b/qcsrc/common/turrets/unit/mlrs.qc
@@ -15,75 +15,75 @@ void spawnfunc_turret_mlrs() { if(!turret_initialize(TUR_MLRS)) remove(self); }
 
 float t_mlrs(float req)
 {
-       switch(req)
-       {
-               case TR_ATTACK:
-               {
-                       entity missile;
+    switch(req)
+    {
+        case TR_ATTACK:
+        {
+            entity missile;
 
-                       turret_tag_fire_update();
-                       missile = turret_projectile("weapons/rocket_fire.wav", 6, 10, DEATH_TURRET_MLRS, PROJECTILE_ROCKET, TRUE, TRUE);
-                       missile.nextthink = time + max(self.tur_impacttime,(self.shot_radius * 2) / self.shot_speed);
-                       missile.missile_flags = MIF_SPLASH;
-                       te_explosion (missile.origin);
+            turret_tag_fire_update();
+            missile = turret_projectile("weapons/rocket_fire.wav", 6, 10, DEATH_TURRET_MLRS, PROJECTILE_ROCKET, TRUE, TRUE);
+            missile.nextthink = time + max(self.tur_impacttime,(self.shot_radius * 2) / self.shot_speed);
+            missile.missile_flags = MIF_SPLASH;
+            te_explosion (missile.origin);
 
-                       return true;
-               }
-               case TR_THINK:
-               {
-                       // 0 = full, 6 = empty
-                       self.tur_head.frame = bound(0, 6 - floor(0.1 + self.ammo / self.shot_dmg), 6);
-                       if(self.tur_head.frame < 0)
-                       {
-                               dprint("ammo:",ftos(self.ammo),"\n");
-                               dprint("shot_dmg:",ftos(self.shot_dmg),"\n");
-                       }
-               
-                       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.shoot_flags  |= TFL_SHOOT_VOLLYALWAYS;
-                       self.volly_counter = self.shot_volly;
+            return true;
+        }
+        case TR_THINK:
+        {
+            // 0 = full, 6 = empty
+            self.tur_head.frame = bound(0, 6 - floor(0.1 + self.ammo / self.shot_dmg), 6);
+            if(self.tur_head.frame < 0)
+            {
+                dprint("ammo:",ftos(self.ammo),"\n");
+                dprint("shot_dmg:",ftos(self.shot_dmg),"\n");
+            }
 
-                       return true;
-               }
-               case TR_PRECACHE:
-               {
-                       precache_model ("models/turrets/base.md3");
-                       precache_model ("models/turrets/mlrs.md3");
-                       return true;
-               }
-       }
+            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;
 
-       return true;
+            self.damage_flags |= TFL_DMG_HEADSHAKE;
+            self.shoot_flags  |= TFL_SHOOT_VOLLYALWAYS;
+            self.volly_counter = self.shot_volly;
+
+            return true;
+        }
+        case TR_PRECACHE:
+        {
+            precache_model ("models/turrets/base.md3");
+            precache_model ("models/turrets/mlrs.md3");
+            return true;
+        }
+    }
+
+    return true;
 }
 
 #endif // SVQC
 #ifdef CSQC
 float t_mlrs(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