Merge branch 'master' into Mario/stats_eloranking

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

diff --git a/qcsrc/common/turrets/turret/tesla.qh b/qcsrc/common/turrets/turret/tesla.qh
index c5f67b1b9d76b2cba0d77092884dbee8334c736c..6f01737be2193a73ffb13bf1088817ca500a64a8 100644 (file)
--- a/qcsrc/common/turrets/turret/tesla.qh
+++ b/qcsrc/common/turrets/turret/tesla.qh
@@ -4,13 +4,21 @@
 
 CLASS(TeslaCoil, Turret)
 /* spawnflags */ ATTRIB(TeslaCoil, spawnflags, int, TUR_FLAG_HITSCAN | TUR_FLAG_PLAYER | TUR_FLAG_MISSILE);
-/* mins       */ ATTRIB(TeslaCoil, mins, vector, '-60 -60 0');
-/* maxs       */ ATTRIB(TeslaCoil, maxs, vector, '60 60 128');
+/* mins       */ ATTRIB(TeslaCoil, m_mins, vector, '-60 -60 0');
+/* maxs       */ ATTRIB(TeslaCoil, m_maxs, vector, '60 60 128');
 /* modelname  */ ATTRIB(TeslaCoil, mdl, string, "tesla_base.md3");
 /* model      */ ATTRIB_STRZONE(TeslaCoil, model, string, strcat("models/turrets/", this.mdl));
 /* head_model */ ATTRIB_STRZONE(TeslaCoil, head_model, string, strcat("models/turrets/", "tesla_head.md3"));
 /* netname    */ ATTRIB(TeslaCoil, netname, string, "tesla");
 /* fullname   */ ATTRIB(TeslaCoil, turret_name, string, _("Tesla Coil"));
     ATTRIB(TeslaCoil, m_weapon, Weapon, WEP_TESLA);
+
+#define X(BEGIN, P, END, class, prefix) \
+       BEGIN(class) \
+               TR_PROPS_COMMON(P, class, prefix) \
+       END()
+       TR_PROPS(X, TeslaCoil, tesla)
+#undef X
+
 ENDCLASS(TeslaCoil)
 REGISTER_TURRET(TESLA, NEW(TeslaCoil));