Merge branch 'master' into Mario/qc_camstuff

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

diff --git a/qcsrc/common/turrets/turret/phaser.qh b/qcsrc/common/turrets/turret/phaser.qh
index fedbe66cba413be8af123689ad77a58b2c3e29a8..0901f5c797144bd5066309857de21d9d0231fd22 100644 (file)
--- a/qcsrc/common/turrets/turret/phaser.qh
+++ b/qcsrc/common/turrets/turret/phaser.qh
@@ -4,13 +4,21 @@
 
 CLASS(PhaserTurret, Turret)
 /* spawnflags */ ATTRIB(PhaserTurret, spawnflags, int, TUR_FLAG_SNIPER | TUR_FLAG_HITSCAN | TUR_FLAG_PLAYER);
-/* mins       */ ATTRIB(PhaserTurret, mins, vector, '-32 -32 0');
-/* maxs       */ ATTRIB(PhaserTurret, maxs, vector, '32 32 64');
+/* mins       */ ATTRIB(PhaserTurret, m_mins, vector, '-32 -32 0');
+/* maxs       */ ATTRIB(PhaserTurret, m_maxs, vector, '32 32 64');
 /* modelname  */ ATTRIB(PhaserTurret, mdl, string, "base.md3");
 /* model      */ ATTRIB_STRZONE(PhaserTurret, model, string, strcat("models/turrets/", this.mdl));
 /* head_model */ ATTRIB_STRZONE(PhaserTurret, head_model, string, strcat("models/turrets/", "phaser.md3"));
 /* netname    */ ATTRIB(PhaserTurret, netname, string, "phaser");
 /* fullname   */ ATTRIB(PhaserTurret, turret_name, string, _("Phaser Cannon"));
     ATTRIB(PhaserTurret, m_weapon, Weapon, WEP_PHASER);
+
+#define X(BEGIN, P, END, class, prefix) \
+       BEGIN(class) \
+               TR_PROPS_COMMON(P, class, prefix) \
+       END()
+       TR_PROPS(X, PhaserTurret, phaser)
+#undef X
+
 ENDCLASS(PhaserTurret)
 REGISTER_TURRET(PHASER, NEW(PhaserTurret));