Merge branch 'Mario/use1' into 'master'

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

diff --git a/qcsrc/common/turrets/turret/hk.qc b/qcsrc/common/turrets/turret/hk.qc
index 61d8318db89eb29a12bb47ee393f01b17af74d19..4e7b4513818e1b0e264e080fdf23a44361541bf6 100644 (file)
--- a/qcsrc/common/turrets/turret/hk.qc
+++ b/qcsrc/common/turrets/turret/hk.qc
@@ -3,15 +3,15 @@
 
 //#define TURRET_DEBUG_HK
 
-#include "hk_weapon.qc"
+#include "hk_weapon.qh"
 
 CLASS(HunterKiller, Turret)
 /* spawnflags */ ATTRIB(HunterKiller, spawnflags, int, TUR_FLAG_SPLASH | TUR_FLAG_MEDPROJ | TUR_FLAG_PLAYER | TUR_FLAG_RECIEVETARGETS);
 /* mins       */ ATTRIB(HunterKiller, mins, vector, '-32 -32 0');
 /* maxs       */ ATTRIB(HunterKiller, maxs, vector, '32 32 64');
 /* modelname  */ ATTRIB(HunterKiller, mdl, string, "base.md3");
-/* model      */ ATTRIB(HunterKiller, model, string, strzone(strcat("models/turrets/", this.mdl)));
-/* head_model */ ATTRIB(HunterKiller, head_model, string, strzone(strcat("models/turrets/", "hk.md3")));
+/* model      */ ATTRIB_STRZONE(HunterKiller, model, string, strcat("models/turrets/", this.mdl));
+/* head_model */ ATTRIB_STRZONE(HunterKiller, head_model, string, strcat("models/turrets/", "hk.md3"));
 /* netname    */ ATTRIB(HunterKiller, netname, string, "hk");
 /* fullname   */ ATTRIB(HunterKiller, turret_name, string, _("Hunter-Killer Turret"));
     ATTRIB(HunterKiller, m_weapon, Weapon, WEP_HK);
@@ -22,8 +22,6 @@ REGISTER_TURRET(HK, NEW(HunterKiller));
 
 #ifdef IMPLEMENTATION
 
-#include "hk_weapon.qc"
-
 #ifdef SVQC
 
 #ifdef TURRET_DEBUG_HK
@@ -32,8 +30,9 @@ REGISTER_TURRET(HK, NEW(HunterKiller));
 
 spawnfunc(turret_hk) { if(!turret_initialize(TUR_HK)) remove(self); }
 
-METHOD(HunterKiller, tr_think, void(HunterKiller thistur))
+METHOD(HunterKiller, tr_think, void(HunterKiller thistur, entity it))
 {
+    SELFPARAM();
     if (self.tur_head.frame != 0)
         self.tur_head.frame = self.tur_head.frame + 1;