Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/common/turrets/unit/machinegun.qc b/qcsrc/common/turrets/unit/machinegun.qc
index f4a46212fc0645d9688223635177a5d159754df8..f952d4b158ac6d5d110f42be7891a8c146920c32 100644 (file)
--- a/qcsrc/common/turrets/unit/machinegun.qc
+++ b/qcsrc/common/turrets/unit/machinegun.qc
@@ -13,66 +13,68 @@ REGISTER_TURRET(
 #ifdef SVQC
 void spawnfunc_turret_machinegun() { if(!turret_initialize(TUR_MACHINEGUN)) remove(self); }
 
+void W_MachineGun_MuzzleFlash(void);
+
 float t_machinegun(float req)
 {
-       switch(req)
-       {
-               case TR_ATTACK:
-               {
-                       fireBullet (self.tur_shotorg, self.tur_shotdir_updated, self.shot_spread, 0, self.shot_dmg, self.shot_force, DEATH_TURRET_MACHINEGUN, 0);
+    switch(req)
+    {
+        case TR_ATTACK:
+        {
+            fireBullet (self.tur_shotorg, self.tur_shotdir_updated, self.shot_spread, 0, self.shot_dmg, self.shot_force, DEATH_TURRET_MACHINEGUN, 0);
 
-                       W_MachineGun_MuzzleFlash();
-                       setattachment(self.muzzle_flash, self.tur_head, "tag_fire");
+            W_MachineGun_MuzzleFlash();
+            setattachment(self.muzzle_flash, self.tur_head, "tag_fire");
 
-                       return true;
-               }
-               case TR_THINK:
-               {
-                       return true;
-               }
-               case TR_DEATH:
-               {
-                       return true;
-               }
-               case TR_SETUP:
-               {
-                       self.damage_flags |= TFL_DMG_HEADSHAKE;
-                       self.target_select_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMITS | TFL_TARGETSELECT_TEAMCHECK;
-                       self.ammo_flags = TFL_AMMO_BULLETS | TFL_AMMO_RECHARGE | TFL_AMMO_RECIEVE;
-                       self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE;
-                       self.turret_flags |= TUR_FLAG_HITSCAN;
+            return true;
+        }
+        case TR_THINK:
+        {
+            return true;
+        }
+        case TR_DEATH:
+        {
+            return true;
+        }
+        case TR_SETUP:
+        {
+            self.damage_flags |= TFL_DMG_HEADSHAKE;
+            self.target_select_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMITS | TFL_TARGETSELECT_TEAMCHECK;
+            self.ammo_flags = TFL_AMMO_BULLETS | TFL_AMMO_RECHARGE | TFL_AMMO_RECIEVE;
+            self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE;
+            self.turret_flags |= TUR_FLAG_HITSCAN;
 
-                       return true;
-               }
-               case TR_PRECACHE:
-               {
-                       precache_model ("models/turrets/base.md3");
-                       precache_model ("models/turrets/machinegun.md3");
-                       precache_sound ("weapons/uzi_fire.wav");
-                       return true;
-               }
-       }
+            return true;
+        }
+        case TR_PRECACHE:
+        {
+            precache_model ("models/turrets/base.md3");
+            precache_model ("models/turrets/machinegun.md3");
+            precache_sound ("weapons/uzi_fire.wav");
+            return true;
+        }
+    }
 
-       return true;
+    return true;
 }
 
 #endif // SVQC
 #ifdef CSQC
 float t_machinegun(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