Merge branch 'master' into terencehill/ft_autorevive_progress

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

diff --git a/qcsrc/common/turrets/turret/hk.qh b/qcsrc/common/turrets/turret/hk.qh
index d7c9cfbbe8a7a00f233bddfbf446622f23c52c3f..29060a61df6d1b3c64c99c35a37faaf11180c4df 100644 (file)
--- a/qcsrc/common/turrets/turret/hk.qh
+++ b/qcsrc/common/turrets/turret/hk.qh
@@ -6,13 +6,26 @@
 
 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');
+/* mins       */ ATTRIB(HunterKiller, m_mins, vector, '-32 -32 0');
+/* maxs       */ ATTRIB(HunterKiller, m_maxs, vector, '32 32 64');
 /* modelname  */ ATTRIB(HunterKiller, mdl, string, "base.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);
+
+#define X(BEGIN, P, END, class, prefix) \
+       BEGIN(class) \
+               TR_PROPS_COMMON(P, class, prefix) \
+               P(class, prefix, shot_speed_accel, float) \
+               P(class, prefix, shot_speed_accel2, float) \
+               P(class, prefix, shot_speed_decel, float) \
+               P(class, prefix, shot_speed_max, float) \
+               P(class, prefix, shot_speed_turnrate, float) \
+       END()
+       TR_PROPS(X, HunterKiller, hk)
+#undef X
+
 ENDCLASS(HunterKiller)
 REGISTER_TURRET(HK, NEW(HunterKiller));