Make uses of R_BeginPolygon explicit as to whether they're 2D or 3D

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

diff --git a/qcsrc/common/turrets/turret/ewheel.qh b/qcsrc/common/turrets/turret/ewheel.qh
index b34adb2fe36a6c45e384ffd59d6d88241afee6b2..8a78d37be3e8f1cf7bfb215623fcd1aa8e621794 100644 (file)
--- a/qcsrc/common/turrets/turret/ewheel.qh
+++ b/qcsrc/common/turrets/turret/ewheel.qh
@@ -6,13 +6,26 @@
 
 CLASS(EWheel, Turret)
 /* spawnflags */ ATTRIB(EWheel, spawnflags, int, TUR_FLAG_PLAYER | TUR_FLAG_MOVE | TUR_FLAG_ROAM);
-/* mins       */ ATTRIB(EWheel, mins, vector, '-32 -32 0');
-/* maxs       */ ATTRIB(EWheel, maxs, vector, '32 32 48');
+/* mins       */ ATTRIB(EWheel, m_mins, vector, '-32 -32 0');
+/* maxs       */ ATTRIB(EWheel, m_maxs, vector, '32 32 48');
 /* modelname  */ ATTRIB(EWheel, mdl, string, "ewheel-base2.md3");
 /* model      */ ATTRIB_STRZONE(EWheel, model, string, strcat("models/turrets/", this.mdl));
 /* head_model */ ATTRIB_STRZONE(EWheel, head_model, string, strcat("models/turrets/", "ewheel-gun1.md3"));
 /* netname    */ ATTRIB(EWheel, netname, string, "ewheel");
 /* fullname   */ ATTRIB(EWheel, turret_name, string, _("eWheel Turret"));
     ATTRIB(EWheel, m_weapon, Weapon, WEP_EWHEEL);
+
+#define X(BEGIN, P, END, class, prefix) \
+       BEGIN(class) \
+               TR_PROPS_COMMON(P, class, prefix) \
+               P(class, prefix, speed_fast, float) \
+               P(class, prefix, speed_slow, float) \
+               P(class, prefix, speed_slower, float) \
+               P(class, prefix, speed_stop, float) \
+               P(class, prefix, turnrate, float) \
+       END()
+       TR_PROPS(X, EWheel, ewheel)
+#undef X
+
 ENDCLASS(EWheel)
 REGISTER_TURRET(EWHEEL, NEW(EWheel));