Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/common/turrets/unit/ewheel.qc b/qcsrc/common/turrets/unit/ewheel.qc
index 7787149ed4e7111ef0a81742216db5bcb67c71b3..1c2dc556459431ef247f67951618fe198ee68fe9 100644 (file)
--- a/qcsrc/common/turrets/unit/ewheel.qc
+++ b/qcsrc/common/turrets/unit/ewheel.qc
@@ -136,7 +136,7 @@ float t_ewheel(float req)
                        {
                                turret_do_updates(self);
 
-                               _mis = turret_projectile("weapons/lasergun_fire.wav", 1, 0, DEATH_TURRET_EWHEEL, PROJECTILE_LASER, TRUE, TRUE);
+                               _mis = turret_projectile("weapons/lasergun_fire.wav", 1, 0, DEATH_TURRET_EWHEEL, PROJECTILE_BLASTER, TRUE, TRUE);
                                _mis.missile_flags = MIF_SPLASH;
 
                                pointparticles(particleeffectnum("laser_muzzleflash"), self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
@@ -300,8 +300,6 @@ float t_ewheel(float req)
                }
                case TR_PRECACHE:
                {
-                       precache_model ("models/turrets/ewheel-base2.md3");
-                       precache_model ("models/turrets/ewheel-gun1.md3");
                        return TRUE;
                }
        }