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 02b0d4af2c4da654ce2601e9cc0ee2ae4ee5e319..6f01737be2193a73ffb13bf1088817ca500a64a8 100644 (file)
--- a/qcsrc/common/turrets/turret/tesla.qh
+++ b/qcsrc/common/turrets/turret/tesla.qh
@@ -15,35 +15,7 @@ CLASS(TeslaCoil, Turret)
 
 #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \
-               P(class, prefix, aim_firetolerance_dist, float) \
-               P(class, prefix, aim_maxpitch, float) \
-               P(class, prefix, aim_maxrot, float) \
-               P(class, prefix, aim_speed, float) \
-               P(class, prefix, ammo, float) \
-               P(class, prefix, ammo_max, float) \
-               P(class, prefix, ammo_recharge, float) \
-               P(class, prefix, health, float) \
-               P(class, prefix, respawntime, float) \
-               P(class, prefix, shot_dmg, float) \
-               P(class, prefix, shot_force, float) \
-               P(class, prefix, shot_radius, float) \
-               P(class, prefix, shot_refire, float) \
-               P(class, prefix, shot_speed, float) \
-               P(class, prefix, shot_spread, float) \
-               P(class, prefix, shot_volly, float) \
-               P(class, prefix, shot_volly_refire, float) \
-               P(class, prefix, target_range, float) \
-               P(class, prefix, target_range_min, float) \
-               P(class, prefix, target_range_optimal, float) \
-               P(class, prefix, target_select_anglebias, float) \
-               P(class, prefix, target_select_missilebias, float) \
-               P(class, prefix, target_select_playerbias, float) \
-               P(class, prefix, target_select_rangebias, float) \
-               P(class, prefix, target_select_samebias, float) \
-               P(class, prefix, track_accel_pitch, float) \
-               P(class, prefix, track_accel_rot, float) \
-               P(class, prefix, track_blendrate, float) \
-               P(class, prefix, track_type, float) \
+               TR_PROPS_COMMON(P, class, prefix) \
        END()
        TR_PROPS(X, TeslaCoil, tesla)
 #undef X