Merge branch 'master' into terencehill/tooltips_cleanup

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

diff --git a/qcsrc/common/turrets/unit/hk.qc b/qcsrc/common/turrets/unit/hk.qc
index 64d9a8c6a7d60d5498a4107e3f22b3ede0517246..25235734badd158eeb3ff3f46a5e43d9b93cff94 100644 (file)
--- a/qcsrc/common/turrets/unit/hk.qc
+++ b/qcsrc/common/turrets/unit/hk.qc
@@ -1,4 +1,4 @@
-#ifdef REGISTER_TURRET
+#ifndef IMPLEMENTATION
 REGISTER_TURRET(
 /* TUR_##id   */ HK,
 /* function   */ t_hk,
@@ -25,7 +25,7 @@ float autocvar_g_turrets_unit_hk_shot_speed_turnrate;
 #endif
 
 float hk_is_valid_target(entity e_target)
-{
+{SELFPARAM();
     if (e_target == world)
         return 0;
 
@@ -59,7 +59,7 @@ float hk_is_valid_target(entity e_target)
 }
 
 void turret_hk_missile_think()
-{
+{SELFPARAM();
     vector vu, vd, vf, vl, vr, ve;  // Vector (direction)
     float  fu, fd, ff, fl, fr, fe;  // Fraction to solid
     vector olddir,wishdir,newdir;   // Final direction
@@ -260,7 +260,7 @@ void turret_hk_missile_think()
 }
 
 float turret_hk_addtarget(entity e_target,entity e_sender)
-{
+{SELFPARAM();
     if (e_target)
     {
         if (turret_validate_target(self,e_target,self.target_validate_flags) > 0)
@@ -273,17 +273,17 @@ float turret_hk_addtarget(entity e_target,entity e_sender)
     return 0;
 }
 
-void spawnfunc_turret_hk() { if(!turret_initialize(TUR_HK)) remove(self); }
+spawnfunc(turret_hk) { if(!turret_initialize(TUR_HK.m_id)) remove(self); }
 
 float t_hk(float req)
-{
+{SELFPARAM();
     switch(req)
     {
         case TR_ATTACK:
         {
             entity missile;
 
-            missile = turret_projectile("weapons/rocket_fire.wav", 6, 10, DEATH_TURRET_HK, PROJECTILE_ROCKET, FALSE, FALSE);
+            missile = turret_projectile(SND(ROCKET_FIRE), 6, 10, DEATH_TURRET_HK, PROJECTILE_ROCKET, FALSE, FALSE);
             te_explosion (missile.origin);
 
             missile.think                      = turret_hk_missile_think;
@@ -329,8 +329,6 @@ float t_hk(float req)
         }
         case TR_PRECACHE:
         {
-            precache_model ("models/turrets/base.md3");
-            precache_model ("models/turrets/hk.md3");
             return true;
         }
     }