Merge branch 'Mario/vaporizer_damage' into 'master'

[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 0142202157145a3bad5738b83553dfa29158d138..1a3c9220b84ca48b6fb75d0c9c986901a73955d4 100644 (file)
--- a/qcsrc/common/turrets/unit/mlrs.qc
+++ b/qcsrc/common/turrets/unit/mlrs.qc
@@ -11,10 +11,10 @@ REGISTER_TURRET(
 );
 #else
 #ifdef SVQC
-void spawnfunc_turret_mlrs() { if(!turret_initialize(TUR_MLRS)) remove(self); }
+void spawnfunc_turret_mlrs() { SELFPARAM(); if(!turret_initialize(TUR_MLRS)) remove(self); }
 
 float t_mlrs(float req)
-{
+{SELFPARAM();
     switch(req)
     {
         case TR_ATTACK:
@@ -22,7 +22,7 @@ float t_mlrs(float req)
             entity missile;
 
             turret_tag_fire_update();
-            missile = turret_projectile("weapons/rocket_fire.wav", 6, 10, DEATH_TURRET_MLRS, PROJECTILE_ROCKET, TRUE, TRUE);
+            missile = turret_projectile(W_Sound("rocket_fire"), 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);
@@ -35,8 +35,8 @@ float t_mlrs(float req)
             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");
+                LOG_TRACE("ammo:",ftos(self.ammo),"\n");
+                LOG_TRACE("shot_dmg:",ftos(self.shot_dmg),"\n");
             }
 
             return true;
@@ -58,8 +58,6 @@ float t_mlrs(float req)
         }
         case TR_PRECACHE:
         {
-            precache_model ("models/turrets/base.md3");
-            precache_model ("models/turrets/mlrs.md3");
             return true;
         }
     }