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 9481483e09cd58e454fdb8b761e0a33dc11934cc..41ded852d2ed539273d46696bc317b1455cdb964 100644 (file)
--- a/qcsrc/common/turrets/unit/machinegun.qc
+++ b/qcsrc/common/turrets/unit/machinegun.qc
@@ -9,17 +9,9 @@ REGISTER_TURRET(
 /* netname       */ "machinegun",
 /* fullname   */ _("Machinegun Turret")
 );
-
-#define MACHINEGUN_SETTINGS(turret) 
-
-
-#ifdef SVQC
-MACHINEGUN_SETTINGS(machinegun)
-#endif // SVQC
 #else
 #ifdef SVQC
-
-void spawnfunc_turret_machinegun() { if not(turret_initialize(TUR_MACHINEGUN)) remove(self); }
+void spawnfunc_turret_machinegun() { if(!turret_initialize(TUR_MACHINEGUN)) remove(self); }
 
 float t_machinegun(float req)
 {
@@ -27,8 +19,7 @@ float t_machinegun(float req)
        {
                case TR_ATTACK:
                {
-                       fireBallisticBullet (self.tur_shotorg, self.tur_shotdir_updated,self.shot_spread, self.shot_speed, 5, self.shot_dmg, self.shot_force, DEATH_TURRET_MACHINEGUN, 0, 1, autocvar_g_balance_uzi_bulletconstant);
-                       endFireBallisticBullet();
+                       fireBullet (self.tur_shotorg, self.tur_shotdir_updated, self.shot_spread, 0, self.shot_dmg, self.shot_force, DEATH_TURRET_MACHINEGUN, 0);
 
                        UziFlash();
                        setattachment(self.muzzle_flash, self.tur_head, "tag_fire");
@@ -49,9 +40,7 @@ float t_machinegun(float req)
                        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;
-                       
-                       if not(autocvar_g_antilag_bullets)
-                               self.turret_flags |= TUR_FLAG_HITSCAN;
+                       self.turret_flags |= TUR_FLAG_HITSCAN;
 
                        return TRUE;
                }
@@ -62,11 +51,6 @@ float t_machinegun(float req)
                        precache_sound ("weapons/uzi_fire.wav");
                        return TRUE;
                }
-               case TR_CONFIG:
-               {
-                       TUR_CONFIG_SETTINGS(MACHINEGUN_SETTINGS(machinegun))
-                       return TRUE;
-               }
        }
 
        return TRUE;