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 41ded852d2ed539273d46696bc317b1455cdb964..26cbc4882835075114623361fb7342f10fe371cb 100644 (file)
--- a/qcsrc/common/turrets/unit/machinegun.qc
+++ b/qcsrc/common/turrets/unit/machinegun.qc
@@ -21,7 +21,7 @@ float t_machinegun(float req)
                {
                        fireBullet (self.tur_shotorg, self.tur_shotdir_updated, self.shot_spread, 0, self.shot_dmg, self.shot_force, DEATH_TURRET_MACHINEGUN, 0);
 
-                       UziFlash();
+                       W_MachineGun_MuzzleFlash();
                        setattachment(self.muzzle_flash, self.tur_head, "tag_fire");
 
                        return TRUE;
@@ -68,8 +68,6 @@ float t_machinegun(float req)
                }
                case TR_PRECACHE:
                {
-                       precache_model ("models/turrets/base.md3");
-                       precache_model ("models/turrets/machinegun.md3");
                        return TRUE;
                }
        }