Merge branch 'master' into terencehill/translated_keys

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

diff --git a/qcsrc/common/turrets/turret/machinegun.qh b/qcsrc/common/turrets/turret/machinegun.qh
index 92a8fbaa4e023f57cf39d85838bf7242e1d8067e..99b1f79e4ab53968571e678337a8885a5405fc81 100644 (file)
--- a/qcsrc/common/turrets/turret/machinegun.qh
+++ b/qcsrc/common/turrets/turret/machinegun.qh
@@ -4,13 +4,21 @@
 
 CLASS(MachineGunTurret, Turret)
 /* spawnflags */ ATTRIB(MachineGunTurret, spawnflags, int, TUR_FLAG_PLAYER);
-/* mins       */ ATTRIB(MachineGunTurret, mins, vector, '-32 -32 0');
-/* maxs       */ ATTRIB(MachineGunTurret, maxs, vector, '32 32 64');
+/* mins       */ ATTRIB(MachineGunTurret, m_mins, vector, '-32 -32 0');
+/* maxs       */ ATTRIB(MachineGunTurret, m_maxs, vector, '32 32 64');
 /* modelname  */ ATTRIB(MachineGunTurret, mdl, string, "base.md3");
 /* model      */ ATTRIB_STRZONE(MachineGunTurret, model, string, strcat("models/turrets/", this.mdl));
 /* head_model */ ATTRIB_STRZONE(MachineGunTurret, head_model, string, strcat("models/turrets/", "machinegun.md3"));
 /* netname    */ ATTRIB(MachineGunTurret, netname, string, "machinegun");
 /* fullname   */ ATTRIB(MachineGunTurret, turret_name, string, _("Machinegun Turret"));
     ATTRIB(MachineGunTurret, m_weapon, Weapon, WEP_TUR_MACHINEGUN);
+
+#define X(BEGIN, P, END, class, prefix) \
+       BEGIN(class) \
+               TR_PROPS_COMMON(P, class, prefix) \
+       END()
+       TR_PROPS(X, MachineGunTurret, machinegun)
+#undef X
+
 ENDCLASS(MachineGunTurret)
 REGISTER_TURRET(MACHINEGUN, NEW(MachineGunTurret));